Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-10-30 10:12:45 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

websocket: Avoid multiple calls to WriteHeader if Upgrade fails

Browse Source
This commit is contained in:
Matthew Holt 2017-09-22 17:39:18 -06:00
parent 643dac688c
commit 64be3e410c
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
caddyhttp/websocket/websocket.go
View File

@ -86,7 +86,9 @@ func serveWS(w http.ResponseWriter, r *http.Request, config *Config) (int, error
} }
conn, err := upgrader.Upgrade(w, r, nil) conn, err := upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
return http.StatusBadRequest, err // the connection has been "handled" -- WriteHeader was called with Upgrade,
// so don't return an error status code; just return an error
return 0, err
} }
defer conn.Close() defer conn.Close()