diff options
| author | Damien Neil <dneil@google.com> | 2022-08-22 16:28:21 -0700 |
|---|---|---|
| committer | Michael Knyszek <mknyszek@google.com> | 2022-09-06 15:49:24 +0000 |
| commit | 9cfe4e258b1c9d4a04a42539c21c7bdb2e227824 (patch) | |
| tree | cb8490754cac68ea981965239912540fdcfe850e | |
| parent | 86e9e0ea87982d117c96575eba3e78e2099fdc98 (diff) | |
| download | go-9cfe4e258b1c9d4a04a42539c21c7bdb2e227824.tar.gz go-9cfe4e258b1c9d4a04a42539c21c7bdb2e227824.zip | |
[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 <tatianabradley@google.com>
Reviewed-by: Roland Shoemaker <bracewell@google.com>
Reviewed-on: https://go-review.googlesource.com/c/go/+/428655
Reviewed-by: Carlos Amedee <carlos@golang.org>
Reviewed-by: Tatiana Bradley <tatiana@golang.org>
Run-TryBot: Michael Knyszek <mknyszek@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
| -rw-r--r-- | src/cmd/internal/moddeps/moddeps_test.go | 2 | ||||
| -rw-r--r-- | src/net/http/h2_bundle.go | 3 |
2 files changed, 5 insertions, 0 deletions
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 |