http: fix panic when recovering from hijacked connection panic

Fixes #2375.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5279049

diff --git a/src/pkg/http/server.go b/src/pkg/http/server.go
index 16071edec6f537fbbd8eaee9419593e501f7573b..018be8cd3ef616569318a386faee2f796af024dd 100644 (file)
--- a/src/pkg/http/server.go
+++ b/src/pkg/http/server.go
@@ -567,7 +567,9 @@ func (c *conn) serve() {
                if err == nil {
                        return
                }
-               c.rwc.Close()
+               if c.rwc != nil { // may be nil if connection hijacked
+                       c.rwc.Close()
+               }
 
                var buf bytes.Buffer
                fmt.Fprintf(&buf, "http: panic serving %v: %v\n", c.remoteAddr, err)