From 5f5eb14fde4c6b1cf9f551e25ff078fa10da43bb Mon Sep 17 00:00:00 2001
From: Michael Tiller <michael.tiller@gmail.com>
Date: Fri, 15 Aug 2014 14:00:42 -0400
Subject: [PATCH] Forgot an error check.

I was trying to use ServeHTTP to directly negotiate a websocket connection without
having to use an actual network connection (i.e., using a `httptest.ResponseRecorder`).
Doing so, I managed to trigger an error here but it wasn't checked which resulted
in a panic later.
---
 server.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server.go b/server.go
index 4de5bb0..7ebd060 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 nil, err;
+	}
 	br = rw.Reader
 
 	if br.Buffered() > 0 {