Skip to content

Commit b6424c9

Browse files
Merge pull request #1833 from SaschaSchwarze0/sascha-update-net-36
[release-v0.15] Update golang.org/x/net from v0.34.0 to v0.36.0 to address GO-2025-3503
2 parents 13cd664 + d31ef92 commit b6424c9

File tree

16 files changed

+742
-935
lines changed

16 files changed

+742
-935
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ require (
105105
golang.org/x/crypto v0.35.0 // indirect
106106
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
107107
golang.org/x/mod v0.23.0 // indirect
108-
golang.org/x/net v0.34.0 // indirect
108+
golang.org/x/net v0.36.0 // indirect
109109
golang.org/x/oauth2 v0.27.0 // indirect
110110
golang.org/x/sync v0.11.0 // indirect
111111
golang.org/x/sys v0.30.0 // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx
506506
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
507507
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
508508
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
509-
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
510-
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
509+
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
510+
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
511511
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
512512
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
513513
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

vendor/golang.org/x/net/context/context.go

+100-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/net/context/go17.go

-72
This file was deleted.

vendor/golang.org/x/net/context/go19.go

-20
This file was deleted.

0 commit comments

Comments
 (0)