diff options
| author | Anmol Sethi <hi@nhooyr.io> | 2020-12-11 23:01:12 +0000 |
|---|---|---|
| committer | Damien Neil <dneil@google.com> | 2020-12-14 19:19:09 +0000 |
| commit | c81343ce3aa1b8f1b2539a3d391f628f69a0a490 (patch) | |
| tree | da3c68c40b837b2fb0ad44e4266775f70a50fac6 /src/net/http/serve_test.go | |
| parent | 828746ec57e76e49527791bca500b27b77576d79 (diff) | |
| download | go-c81343ce3aa1b8f1b2539a3d391f628f69a0a490.tar.gz go-c81343ce3aa1b8f1b2539a3d391f628f69a0a490.zip | |
net/http: attempt deadlock fix in TestDisableKeepAliveUpgrade
1. The test now checks the response status code.
2. The transport has been changed to not set "Connection: Close" if
DisableKeepAlive is set and the request is a HTTP/1.1 protocol
upgrade.
Updates #43073
Change-Id: I9977a18b33b8747ef847a8d11bb7b4f2d8053b8c
GitHub-Last-Rev: f809cebb139df4f5560a8456973351c95a3dfa97
GitHub-Pull-Request: golang/go#43086
Reviewed-on: https://go-review.googlesource.com/c/go/+/276375
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Damien Neil <dneil@google.com>
Trust: Dmitri Shuralyov <dmitshur@golang.org>
Diffstat (limited to 'src/net/http/serve_test.go')
| -rw-r--r-- | src/net/http/serve_test.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go index b1bf8e6c5e..95e6bf4adb 100644 --- a/src/net/http/serve_test.go +++ b/src/net/http/serve_test.go @@ -6481,6 +6481,10 @@ func TestDisableKeepAliveUpgrade(t *testing.T) { } defer resp.Body.Close() + if resp.StatusCode != StatusSwitchingProtocols { + t.Fatalf("unexpected status code: %v", resp.StatusCode) + } + rwc, ok := resp.Body.(io.ReadWriteCloser) if !ok { t.Fatalf("Response.Body is not a io.ReadWriteCloser: %T", resp.Body) |