aboutsummaryrefslogtreecommitdiff
path: root/src/go.mod
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2019-06-07 17:56:24 +0000
committerBrad Fitzpatrick <bradfitz@golang.org>2019-06-07 18:48:19 +0000
commit4c84d878130287f0c1d22afd83471e891600bf0f (patch)
tree499a47d0403dfd31a49119cef9f55c69d32cf655 /src/go.mod
parent74d92db8d77e20b934821b13a92bccb01dbeeb68 (diff)
downloadgo-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/go.mod')
-rw-r--r--src/go.mod2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/go.mod b/src/go.mod
index d7d707c2d7..5151a7eb82 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -4,7 +4,7 @@ go 1.12
require (
golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f
- golang.org/x/net v0.0.0-20190514140710-3ec191127204
+ golang.org/x/net v0.0.0-20190607172144-d5cec3884524
golang.org/x/sys v0.0.0-20190529130038-5219a1e1c5f8 // indirect
golang.org/x/text v0.3.2 // indirect
)