qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 05:14:40 -07:00
Code Releases Activity

undo CL 5414048 / f6b994f33cf4

Browse Source 
breaks build

««« original CL description
http: close connection after printing panic stack trace
In a testing situation, it's possible for a local http
server to panic and the test exit without the stack trace
ever being printed.
Fixes #2480.

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

»»»

R=bradfitz
CC=golang-dev
https://golang.org/cl/5482061
This commit is contained in:
Russ Cox 2011-12-13 17:08:18 -05:00
parent 5fb7e5b482
commit 2c6d3eaf78
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pkg/net/http/server.go
View File

@ -569,14 +569,14 @@ func (c *conn) serve() {
if err == nil { if err == nil {
return return
} }
if c.rwc != nil { // may be nil if connection hijacked
c.rwc.Close()
}
var buf bytes.Buffer var buf bytes.Buffer
fmt.Fprintf(&buf, "http: panic serving %v: %v\n", c.remoteAddr, err) fmt.Fprintf(&buf, "http: panic serving %v: %v\n", c.remoteAddr, err)
buf.Write(debug.Stack()) buf.Write(debug.Stack())
log.Print(buf.String()) log.Print(buf.String())
if c.rwc != nil { // may be nil if connection hijacked
c.rwc.Close()
}
}() }()
if tlsConn, ok := c.rwc.(*tls.Conn); ok { if tlsConn, ok := c.rwc.(*tls.Conn); ok {