[release-branch.go1.19] all: upgrade golang.org/x/net to v0.0.0-20221214163817-183621...

Update x/net to include the fix for #53960.

For #53960
For #56154

Change-Id: Ib3e0d66e4125601e20f1b2e3040f29e7ebd4b080
Reviewed-on: https://go-review.googlesource.com/c/go/+/457556
Run-TryBot: Damien Neil <dneil@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Than McIntosh <thanm@google.com>

diff --git a/src/go.mod b/src/go.mod
index 6c316312a26dea63b24b9074c1e0cc286045b567..62f3489183e12ce2d51af2bdab2f572085c0e30d 100644 (file)
--- a/src/go.mod
+++ b/src/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
        golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8
-       golang.org/x/net v0.0.0-20220907013720-d52c520e3766
+       golang.org/x/net v0.0.0-20221214163817-183621ab9c4e
 )
 
 require (

diff --git a/src/go.sum b/src/go.sum
index 2f90a33f3af391af1d5601c13a9ed287c2bec659..5857a41946b7ad12704fd2a347ef6da8214d2f47 100644 (file)
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,7 +1,7 @@
 golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs=
 golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/net v0.0.0-20220907013720-d52c520e3766 h1:D02YdIT3M6OQkZXTQiO761u/SmR3DDDiDXLN2oZIUac=
-golang.org/x/net v0.0.0-20220907013720-d52c520e3766/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20221214163817-183621ab9c4e h1:ny/17Y8U4fgn9XOKSWpD8Fgz3CD+msKsE74LF845pIg=
+golang.org/x/net v0.0.0-20221214163817-183621ab9c4e/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098 h1:PgOr27OhUx2IRqGJ2RxAWI4dJQ7bi9cSrB82uzFzfUA=
 golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.8-0.20220509174342-b4bca84b0361 h1:h+pU/hCb7sEApigI6eII3/Emx5ZHaFWS+nulUp0Az/k=

diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go
index c69d6c1ebbd782b011192279951fff24dfd5e78c..2e5ef078e5c736c96d2f6ce7defe4fa20ad1e671 100644 (file)
--- a/src/net/http/h2_bundle.go
+++ b/src/net/http/h2_bundle.go
@@ -5764,12 +5764,6 @@ func (sc *http2serverConn) newWriterAndRequest(st *http2stream, f *http2MetaHead
                return nil, nil, sc.countError("bad_path_method", http2streamError(f.StreamID, http2ErrCodeProtocol))
        }
 
-       bodyOpen := !f.StreamEnded()
-       if rp.method == "HEAD" && bodyOpen {
-               // HEAD requests can't have bodies
-               return nil, nil, sc.countError("head_body", http2streamError(f.StreamID, http2ErrCodeProtocol))
-       }
-
        rp.header = make(Header)
        for _, hf := range f.RegularFields() {
                rp.header.Add(sc.canonicalHeader(hf.Name), hf.Value)
@@ -5782,6 +5776,7 @@ func (sc *http2serverConn) newWriterAndRequest(st *http2stream, f *http2MetaHead
        if err != nil {
                return nil, nil, err
        }
+       bodyOpen := !f.StreamEnded()
        if bodyOpen {
                if vv, ok := rp.header["Content-Length"]; ok {
                        if cl, err := strconv.ParseUint(vv[0], 10, 63); err == nil {

diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
index 35c0208e4e0a38e4f70a7ed799420946f12af83b..fd6a1ae10b48be77f1d9ab6f686bcb6d5cb60b68 100644 (file)
--- a/src/vendor/modules.txt
+++ b/src/vendor/modules.txt
@@ -9,7 +9,7 @@ golang.org/x/crypto/curve25519/internal/field
 golang.org/x/crypto/hkdf
 golang.org/x/crypto/internal/poly1305
 golang.org/x/crypto/internal/subtle
-# golang.org/x/net v0.0.0-20220907013720-d52c520e3766
+# golang.org/x/net v0.0.0-20221214163817-183621ab9c4e
 ## explicit; go 1.17
 golang.org/x/net/dns/dnsmessage
 golang.org/x/net/http/httpguts