diff options
| author | Filippo Valsorda <filippo@golang.org> | 2019-08-11 14:34:32 -0400 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2019-08-12 20:14:38 +0000 |
| commit | 45504066d7eb369b5be47429806e64d2ba6eb43a (patch) | |
| tree | 6882ef8bb96dc5f1b338eb78990f5ab4384e095f /src/go.mod | |
| parent | 8b058cfbcec5dc3002ddd6cedc7070ff946b2257 (diff) | |
| download | go-45504066d7eb369b5be47429806e64d2ba6eb43a.tar.gz go-45504066d7eb369b5be47429806e64d2ba6eb43a.zip | |
src/go.mod: sync golang.org/x/net with h2_bundle.go
The bundle included changes from a commit after the one referred to by
the go.mod, probably due to cmd/bundle using the GOPATH source.
Identified with the new go/packages based cmd/bundle from CL 189818.
$ go get golang.org/x/net@461777fb6f
$ go mod tidy
$ go mod vendor
$ go generate net/http # with CL 189818
Also, updated the socks_bundle.go generate command to drop obsolete
options and match h2_bundle.go. It caused no output changes.
Updates #32031
Change-Id: I0322d4e842dbfdad749455111072ca4872a62ad4
Reviewed-on: https://go-review.googlesource.com/c/go/+/189897
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Diffstat (limited to 'src/go.mod')
| -rw-r--r-- | src/go.mod | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/go.mod b/src/go.mod index 2e0fec4b15..0d7d70f014 100644 --- a/src/go.mod +++ b/src/go.mod @@ -4,7 +4,7 @@ go 1.12 require ( golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 - golang.org/x/net v0.0.0-20190607172144-d5cec3884524 + golang.org/x/net v0.0.0-20190607181551-461777fb6f67 golang.org/x/sys v0.0.0-20190529130038-5219a1e1c5f8 // indirect golang.org/x/text v0.3.2 // indirect ) |