diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2016-01-13 16:30:00 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-01-13 17:52:50 +0000 |
| commit | 70ee525261f7d8adbcf58c2cf54efb7e7efb1c82 (patch) | |
| tree | 84a88b619c2d19bae41d3c42e9ce995ed89e5a62 /src/net/http/export_test.go | |
| parent | 4525571f7e911102636ce0af3bedcd467ee8b45c (diff) | |
| download | go-70ee525261f7d8adbcf58c2cf54efb7e7efb1c82.tar.xz | |
net/http: fix Transport crash when abandoning dial which upgrades protos
When the Transport was creating an bound HTTP connection (protocol
unknown initially) and then ends up deciding it doesn't need it, a
goroutine sits around to clean up whatever the result was. That
goroutine made the false assumption that the result was always an
HTTP/1 connection or an error. It may also be an alternate protocol
in which case the *persistConn.conn net.Conn field is nil, and the
alt field is non-nil.
Fixes #13839
Change-Id: Ia4972e5eb1ad53fa00410b3466d4129c753e0871
Reviewed-on: https://go-review.googlesource.com/18573
Reviewed-by: Russ Cox <rsc@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/net/http/export_test.go')
| -rw-r--r-- | src/net/http/export_test.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/net/http/export_test.go b/src/net/http/export_test.go index 514d02b2a3..52bccbdce3 100644 --- a/src/net/http/export_test.go +++ b/src/net/http/export_test.go @@ -21,6 +21,7 @@ var ( ExportServerNewConn = (*Server).newConn ExportCloseWriteAndWait = (*conn).closeWriteAndWait ExportErrRequestCanceled = errRequestCanceled + ExportErrRequestCanceledConn = errRequestCanceledConn ExportServeFile = serveFile ExportHttp2ConfigureTransport = http2ConfigureTransport ExportHttp2ConfigureServer = http2ConfigureServer |