diff options
| author | Dmitri Shuralyov <dmitshur@golang.org> | 2018-12-14 14:56:19 -0500 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2018-12-14 20:32:28 +0000 |
| commit | 66f09979ded78fed046995fca85ed1711ebf1cde (patch) | |
| tree | 723434f8c8021df8894fc97220d9d0b6a26cc763 | |
| parent | 17bf5e903184a271b04eb917a42b528c5730f38c (diff) | |
| download | go-66f09979ded78fed046995fca85ed1711ebf1cde.tar.gz go-66f09979ded78fed046995fca85ed1711ebf1cde.zip | |
[release-branch.go1.11] net/http: update bundled x/net/http2
This updates x/net/http2 to x/net on the latest commit of x/net on
release-branch.go1.11 branch, golang/net@a4630153038d3cb8c57f, for:
[release-branch.go1.11] http2: don't leak streams on broken body
https://golang.org/cl/154237
Fixes #28673
Change-Id: I8f40c69502fa95d1d9dff1ab68444640444442aa
Reviewed-on: https://go-review.googlesource.com/c/154298
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <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 12cf65f109..2cd2b86df2 100644 --- a/src/net/http/h2_bundle.go +++ b/src/net/http/h2_bundle.go @@ -7705,6 +7705,7 @@ func (cc *http2ClientConn) roundTrip(req *Request) (res *Response, gotErrAfterRe default: } if err != nil { + cc.forgetStreamID(cs.ID) return nil, cs.getStartedWrite(), err } bodyWritten = true @@ -7826,6 +7827,7 @@ func (cs *http2clientStream) writeRequestBody(body io.Reader, bodyCloser io.Clos sawEOF = true err = nil } else if err != nil { + cc.writeStreamReset(cs.ID, http2ErrCodeCancel, err) return err } |