diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2016-05-10 09:46:39 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-05-10 18:45:04 +0000 |
| commit | f77f22b2bf43f565ac0933c8e1068c387e4007c3 (patch) | |
| tree | 3292ec948c362393b497d4b759e18521258aee62 /src/net/http/clientserver_test.go | |
| parent | 78ff74375930d5ae391beae562c91da40e5d92a4 (diff) | |
| download | go-f77f22b2bf43f565ac0933c8e1068c387e4007c3.tar.xz | |
net/http: update bundled x/net/http2
Updates x/net/http2 to git rev 96dbb961 for golang.org/cl/23002
Fixes #15366
Updates #15134 (server part remains)
Change-Id: I29336e624706f906b754da66381a620ae3293c6c
Reviewed-on: https://go-review.googlesource.com/23003
Reviewed-by: Andrew Gerrand <adg@golang.org>
Run-TryBot: Andrew Gerrand <adg@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/net/http/clientserver_test.go')
| -rw-r--r-- | src/net/http/clientserver_test.go | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/net/http/clientserver_test.go b/src/net/http/clientserver_test.go index 9c3949fc39..39c1eaa04a 100644 --- a/src/net/http/clientserver_test.go +++ b/src/net/http/clientserver_test.go @@ -229,11 +229,6 @@ func (tt h12Compare) normalizeRes(t *testing.T, res *Response, wantProto string) } slurp, err := ioutil.ReadAll(res.Body) - // TODO(bradfitz): short-term hack. Fix the - // http2 side of golang.org/issue/15366 once - // the http1 part is submitted. - res.Uncompressed = false - res.Body.Close() res.Body = slurpResult{ ReadCloser: ioutil.NopCloser(bytes.NewReader(slurp)), @@ -1176,12 +1171,6 @@ func TestH12_AutoGzipWithDumpResponse(t *testing.T) { io.WriteString(w, "\x1f\x8b\b\x00\x00\x00\x00\x00\x00\x00s\xf3\xf7\a\x00\xab'\xd4\x1a\x03\x00\x00\x00") }, EarlyCheckResponse: func(proto string, res *Response) { - if proto == "HTTP/2.0" { - // TODO(bradfitz): Fix the http2 side - // of golang.org/issue/15366 once the - // http1 part is submitted. - return - } if !res.Uncompressed { t.Errorf("%s: expected Uncompressed to be set", proto) } |