From 4292df70df546334d4174bcd77271253c9b7835c Mon Sep 17 00:00:00 2001 From: Gary Burd Date: Fri, 15 Aug 2014 20:25:38 -0700 Subject: [PATCH] Check and handle error return from hijack. --- server.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server.go b/server.go index 4de5bb0..c24c410 100644 --- a/server.go +++ b/server.go @@ -137,6 +137,9 @@ func (u *Upgrader) Upgrade(w http.ResponseWriter, r *http.Request, responseHeade } var rw *bufio.ReadWriter netConn, rw, err = h.Hijack() + if err != nil { + return u.returnError(w, r, http.StatusInternalServerError, err.Error()) + } br = rw.Reader if br.Buffered() > 0 {