diff options
| author | Dmitri Shuralyov <dmitshur@golang.org> | 2021-03-29 11:19:23 -0400 |
|---|---|---|
| committer | Dmitri Shuralyov <dmitshur@golang.org> | 2021-03-29 15:50:44 +0000 |
| commit | 69b943102868747ff2b62d9ada02c464d9984aef (patch) | |
| tree | f95435bbf7c6ee0059423ce076ad758ea2a09ec9 | |
| parent | 7c88ae4117c16c1e5b80189b81d67845e1c40d9d (diff) | |
| download | go-69b943102868747ff2b62d9ada02c464d9984aef.tar.gz go-69b943102868747ff2b62d9ada02c464d9984aef.zip | |
[release-branch.go1.15] net/http: update bundled x/net/http2
Bring in the change in CL 304309 with:
go mod edit -replace=golang.org/x/net=golang.org/x/net@release-branch.go1.15-bundle
GOFLAGS='-mod=mod' go generate -run=bundle std
go mod edit -dropreplace=golang.org/x/net
go get -d golang.org/x/net@release-branch.go1.15
go mod tidy
go mod vendor
For #45076.
Updates #40213.
Change-Id: I68d5e1f2394508c9cf8627fb852dd9e906d45016
Reviewed-on: https://go-review.googlesource.com/c/go/+/305489
Trust: Dmitri Shuralyov <dmitshur@golang.org>
Trust: Emmanuel Odeke <emmanuel@orijtech.com>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>
TryBot-Result: Go Bot <gobot@golang.org>
| -rw-r--r-- | src/net/http/h2_bundle.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go index 678c6eb9d4..3d83084702 100644 --- a/src/net/http/h2_bundle.go +++ b/src/net/http/h2_bundle.go @@ -8985,6 +8985,8 @@ func http2strSliceContains(ss []string, s string) bool { type http2erringRoundTripper struct{ err error } +func (rt http2erringRoundTripper) RoundTripErr() error { return rt.err } + func (rt http2erringRoundTripper) RoundTrip(*Request) (*Response, error) { return nil, rt.err } // gzipReader wraps a response body so it can lazily |