[release-branch.go1.14] net/http: update bundled x/net/http2

Bring in the change in CL 266157 with:

	go get -d golang.org/x/net@release-branch.go1.14
	go mod tidy
	go mod vendor
	go generate -run=bundle std

Updates #39337.
Fixes #42112.

Change-Id: Iefd0012369c7f0c58201256e29d21210cb9f2f7a
Reviewed-on: https://go-review.googlesource.com/c/go/+/266374
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Dmitri Shuralyov <dmitshur@golang.org>

diff --git a/src/go.mod b/src/go.mod
index 8b4faa0296dd020e0fcf4e365fae41c5d4ff4276..faf848d5df6026b0095d0e5da4c24ef71ed5af0d 100644 (file)
--- a/src/go.mod
+++ b/src/go.mod
@@ -4,7 +4,7 @@ go 1.14
 
 require (
        golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d
-       golang.org/x/net v0.0.0-20201012150639-9ef5ab9c4fbe
+       golang.org/x/net v0.0.0-20201029202311-70d85028bad3
        golang.org/x/sys v0.0.0-20200201011859-915c9c3d4ccf // indirect
        golang.org/x/text v0.3.3-0.20191031172631-4b67af870c6f // indirect
 )

diff --git a/src/go.sum b/src/go.sum
index 2968b35317116d51e24f84a8b3be903ad6508946..58d6621a2fbeb4a844988b03e1ad6c2ac2a37ead 100644 (file)
--- a/src/go.sum
+++ b/src/go.sum
@@ -2,8 +2,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d h1:9FCpayM9Egr1baVnV1SX0H87m+XB0B8S0hAMi99X/3U=
 golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20201012150639-9ef5ab9c4fbe h1:bea4OrKKl5Xs3lVowY+U6d4AgoAmwTzwqwe3KvM9MOE=
-golang.org/x/net v0.0.0-20201012150639-9ef5ab9c4fbe/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201029202311-70d85028bad3 h1:zhmuDiUI8/S25xjIBeUn8XwfxP7SKYR41pTuOoa1O+w=
+golang.org/x/net v0.0.0-20201029202311-70d85028bad3/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200201011859-915c9c3d4ccf h1:+4j7oujXP478CVb/AFvHJmVX5+Pczx2NGts5yirA0oY=

diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go
index 3a575e3f2ccdcd4c0d852156e60db6f4855705f8..0e9139b9efff9042a881463eae04dac6d12303b3 100644 (file)
--- a/src/net/http/h2_bundle.go
+++ b/src/net/http/h2_bundle.go
@@ -7169,6 +7169,7 @@ func (t *http2Transport) newClientConn(c net.Conn, singleUse bool) (*http2Client
        cc.inflow.add(http2transportDefaultConnFlow + http2initialWindowSize)
        cc.bw.Flush()
        if cc.werr != nil {
+               cc.Close()
                return nil, cc.werr
        }
 
@@ -7534,6 +7535,15 @@ func (cc *http2ClientConn) roundTrip(req *Request) (res *Response, gotErrAfterRe
        bodyWriter := cc.t.getBodyWriterState(cs, body)
        cs.on100 = bodyWriter.on100
 
+       defer func() {
+               cc.wmu.Lock()
+               werr := cc.werr
+               cc.wmu.Unlock()
+               if werr != nil {
+                       cc.Close()
+               }
+       }()
+
        cc.wmu.Lock()
        endStream := !hasBody && !hasTrailers
        werr := cc.writeHeaders(cs.ID, endStream, int(cc.maxFrameSize), hdrs)

diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
index 54989a2630ed6efd753e4eef67b640c5682e5a77..7c6c478b12902718f117b9609f006cc7aff20885 100644 (file)
--- a/src/vendor/modules.txt
+++ b/src/vendor/modules.txt
@@ -8,7 +8,7 @@ golang.org/x/crypto/curve25519
 golang.org/x/crypto/hkdf
 golang.org/x/crypto/internal/subtle
 golang.org/x/crypto/poly1305
-# golang.org/x/net v0.0.0-20201012150639-9ef5ab9c4fbe
+# golang.org/x/net v0.0.0-20201029202311-70d85028bad3
 ## explicit
 golang.org/x/net/dns/dnsmessage
 golang.org/x/net/http/httpguts