mirror of
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
synced 2025-10-13 11:11:30 -04:00
Restore sending close message before closing
And simplify EOF check.
This commit is contained in:
parent
c417fd5599
commit
abefae1587
1 changed files with 6 additions and 6 deletions
|
@ -77,12 +77,10 @@ func (conn *webSocketConn) Read(b []byte) (n int, err error) {
|
|||
}
|
||||
|
||||
n, err = conn.r.Read(b)
|
||||
if err != nil {
|
||||
if err == io.EOF {
|
||||
// Message finished
|
||||
conn.r = nil
|
||||
err = nil
|
||||
}
|
||||
if err == io.EOF {
|
||||
// Message finished
|
||||
conn.r = nil
|
||||
err = nil
|
||||
}
|
||||
return
|
||||
}
|
||||
|
@ -102,6 +100,8 @@ func (conn *webSocketConn) Write(b []byte) (n int, err error) {
|
|||
|
||||
// Implements io.Closer.
|
||||
func (conn *webSocketConn) Close() error {
|
||||
// Ignore any error in trying to write a Close frame.
|
||||
_ = conn.Ws.WriteControl(websocket.CloseMessage, []byte{}, time.Now().Add(time.Second))
|
||||
return conn.Ws.Close()
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue