Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix websocket disconnection errors #723

Merged
merged 1 commit into from
Jun 17, 2021
Merged

Fix websocket disconnection errors #723

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/WebSockets.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,17 @@ end

function Base.close(ws::WebSocket; statuscode::Union{Int, Nothing}=nothing)
if !ws.txclosed
closewrite(ws; statuscode=statuscode)
try
closewrite(ws; statuscode=statuscode)
catch e
e isa Base.IOError || rethrow(e)
end
end
while !eof(ws) # FIXME Timeout in case other end does not send CLOSE?
try
readframe(ws)
catch e
e isa WebSocketError || rethrow(e)
e isa WebSocketError || e isa Base.IOError || rethrow(e)
end
end
close(ws.io)
Expand Down