From 9cfe4e258b1c9d4a04a42539c21c7bdb2e227824 Mon Sep 17 00:00:00 2001 From: Damien Neil Date: Mon, 22 Aug 2022 16:28:21 -0700 Subject: [PATCH] [release-branch.go1.19] net/http: update bundled golang.org/x/net/http2 Disable cmd/internal/moddeps test, since this update includes PRIVATE track fixes. Fixes CVE-2022-27664 Fixes #54376 For #54658 Change-Id: I747900a66d7276e7d0bd246cd8cd0da95305c3ca Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1554417 Reviewed-by: Tatiana Bradley Reviewed-by: Roland Shoemaker Reviewed-on: https://go-review.googlesource.com/c/go/+/428655 Reviewed-by: Carlos Amedee Reviewed-by: Tatiana Bradley Run-TryBot: Michael Knyszek TryBot-Result: Gopher Robot --- src/cmd/internal/moddeps/moddeps_test.go | 2 ++ src/net/http/h2_bundle.go | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/cmd/internal/moddeps/moddeps_test.go b/src/cmd/internal/moddeps/moddeps_test.go index 053cb8f548..9f8cfcd77b 100644 --- a/src/cmd/internal/moddeps/moddeps_test.go +++ b/src/cmd/internal/moddeps/moddeps_test.go @@ -33,6 +33,8 @@ import ( // See issues 36852, 41409, and 43687. // (Also see golang.org/issue/27348.) func TestAllDependencies(t *testing.T) { + t.Skip("TODO(#54376): 1.19.1 contains unreleased changes from vendored modules") + goBin := testenv.GoToolPath(t) // Ensure that all packages imported within GOROOT diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go index 53fbe9352a..0e5fa6712e 100644 --- a/src/net/http/h2_bundle.go +++ b/src/net/http/h2_bundle.go @@ -5058,6 +5058,9 @@ func (sc *http2serverConn) startGracefulShutdownInternal() { func (sc *http2serverConn) goAway(code http2ErrCode) { sc.serveG.check() if sc.inGoAway { + if sc.goAwayCode == http2ErrCodeNo { + sc.goAwayCode = code + } return } sc.inGoAway = true -- 2.48.1