[release-branch.go1.18] all: upgrade golang.org/x/net to v0.0.0-20221214163811-6143a1...

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

For #53960
For #56323

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

diff --git a/src/go.mod b/src/go.mod
index 4613bb68255853dd7698c230e8721782b6e76213..e11c6d7df80053e2c47d8d26047377629d4fc6b3 100644 (file)
--- a/src/go.mod
+++ b/src/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 require (
        golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
-       golang.org/x/net v0.0.0-20220907013725-0a43f88f7ef0
+       golang.org/x/net v0.0.0-20221214163811-6143a133e5c9
 )
 
 require (

diff --git a/src/go.sum b/src/go.sum
index 07cb8d82d5396a32ec6714b34062e874efe52951..d2bfed64dc97389e5ceba0664d3b55568fe90b0e 100644 (file)
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,7 +1,7 @@
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/net v0.0.0-20220907013725-0a43f88f7ef0 h1:XXaSUSplyi6wsRNJGB7vUBvDjbxc8UPYBsf9ukBQ3KA=
-golang.org/x/net v0.0.0-20220907013725-0a43f88f7ef0/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20221214163811-6143a133e5c9 h1:gcbGP3ZkgsHGpX/48qvg7Q/YmTtzZRWc/zpvN8XGSBg=
+golang.org/x/net v0.0.0-20221214163811-6143a133e5c9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
 golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2 h1:GLw7MR8AfAG2GmGcmVgObFOHXYypgGjnGno25RDwn3Y=

diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go
index 381f91c8ad983b52044f0e117cb39038013a5713..3a21ecac3dcadab0b5a76a2a5f20cbabfae0df41 100644 (file)
--- a/src/net/http/h2_bundle.go
+++ b/src/net/http/h2_bundle.go
@@ -5760,12 +5760,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)
@@ -5778,6 +5772,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 109a99e44a35c95ed0c65019047836567b3f9e47..157c1fe602a31e76a33c3ece39c9111ed641081d 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-20220907013725-0a43f88f7ef0
+# golang.org/x/net v0.0.0-20221214163811-6143a133e5c9
 ## explicit; go 1.17
 golang.org/x/net/dns/dnsmessage
 golang.org/x/net/http/httpguts