mirror of
https://github.com/golang/go
synced 2024-11-21 23:24:41 -07:00
undo CL 5414048 / f6b994f33cf4
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:
parent
5fb7e5b482
commit
2c6d3eaf78
@ -569,14 +569,14 @@ func (c *conn) serve() {
|
||||
if err == nil {
|
||||
return
|
||||
}
|
||||
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)
|
||||
buf.Write(debug.Stack())
|
||||
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 {
|
||||
|
Loading…
Reference in New Issue
Block a user