diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2019-06-07 17:56:24 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-06-07 18:48:19 +0000 |
| commit | 4c84d878130287f0c1d22afd83471e891600bf0f (patch) | |
| tree | 499a47d0403dfd31a49119cef9f55c69d32cf655 /src/vendor | |
| parent | 74d92db8d77e20b934821b13a92bccb01dbeeb68 (diff) | |
| download | go-4c84d878130287f0c1d22afd83471e891600bf0f.tar.gz go-4c84d878130287f0c1d22afd83471e891600bf0f.zip | |
net/http: support BaseContext & ConnContext for http2 Server
This is the net/http half of #32476. This supplies the method needed
by the other half in x/net/http2 in the already-submitted CL 181259,
which this CL also bundles in h2_bundle.go.
Thanks to Tom Thorogood (@tmthrgd) for the bug report and test.
Fixes #32476
Updates #30694
Change-Id: I79d2a280e486fbf75d116f6695fd3abb61278765
Reviewed-on: https://go-review.googlesource.com/c/go/+/181260
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/vendor')
| -rw-r--r-- | src/vendor/modules.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt index b7a9006746..d8b5df5b38 100644 --- a/src/vendor/modules.txt +++ b/src/vendor/modules.txt @@ -7,7 +7,7 @@ golang.org/x/crypto/hkdf golang.org/x/crypto/internal/chacha20 golang.org/x/crypto/internal/subtle golang.org/x/crypto/poly1305 -# golang.org/x/net v0.0.0-20190514140710-3ec191127204 +# golang.org/x/net v0.0.0-20190607172144-d5cec3884524 golang.org/x/net/dns/dnsmessage golang.org/x/net/http/httpguts golang.org/x/net/http/httpproxy |