aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNicholas S. Husin <nsh@golang.org>2026-04-10 15:29:23 -0400
committerNicholas Husin <nsh@golang.org>2026-04-10 14:07:30 -0700
commit4a9e479d06754923aad320c53ab02371266f6b57 (patch)
treee49f3d7a50843e448bb4df3ca54800c4250bd767 /src
parent6064169e0507e71305e7b600e607e357fc842dd9 (diff)
downloadgo-4a9e479d06754923aad320c53ab02371266f6b57.tar.xz
all: update to x/net@cd64923cd7f4
This brings in CL 765520. For #70914 Change-Id: I5b67c8a555c68b03cebe687aeb5095936a6a6964 Reviewed-on: https://go-review.googlesource.com/c/go/+/765441 Reviewed-by: Nicholas Husin <husin@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Damien Neil <dneil@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/cmd/go.mod4
-rw-r--r--src/cmd/go.sum8
-rw-r--r--src/cmd/vendor/golang.org/x/sys/windows/dll_windows.go37
-rw-r--r--src/cmd/vendor/golang.org/x/sys/windows/security_windows.go6
-rw-r--r--src/cmd/vendor/modules.txt4
-rw-r--r--src/go.mod8
-rw-r--r--src/go.sum16
-rw-r--r--src/vendor/golang.org/x/net/internal/http3/roundtrip.go14
-rw-r--r--src/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64_other.go2
-rw-r--r--src/vendor/modules.txt8
10 files changed, 39 insertions, 68 deletions
diff --git a/src/cmd/go.mod b/src/cmd/go.mod
index 9a2085fab3..342c56240b 100644
--- a/src/cmd/go.mod
+++ b/src/cmd/go.mod
@@ -8,7 +8,7 @@ require (
golang.org/x/build v0.0.0-20260122183339-3ba88df37c64
golang.org/x/mod v0.34.0
golang.org/x/sync v0.20.0
- golang.org/x/sys v0.42.1-0.20260320201212-a76ec62d6c53
+ golang.org/x/sys v0.43.0
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c
golang.org/x/term v0.39.0
golang.org/x/tools v0.43.1-0.20260407202037-f6476fbaabd3
@@ -16,6 +16,6 @@ require (
require (
github.com/ianlancetaylor/demangle v0.0.0-20250417193237-f615e6bd150b // indirect
- golang.org/x/text v0.35.0 // indirect
+ golang.org/x/text v0.36.0 // indirect
rsc.io/markdown v0.0.0-20240306144322-0bf8f97ee8ef // indirect
)
diff --git a/src/cmd/go.sum b/src/cmd/go.sum
index 1affc0bbc1..9d2e85a6e0 100644
--- a/src/cmd/go.sum
+++ b/src/cmd/go.sum
@@ -14,14 +14,14 @@ golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/sys v0.42.1-0.20260320201212-a76ec62d6c53 h1:0T1C9w/fKTlj64Z8y0UtRoCAD7UZ+l5ZCSHcs3GYSCI=
-golang.org/x/sys v0.42.1-0.20260320201212-a76ec62d6c53/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
+golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c h1:6a8FdnNk6bTXBjR4AGKFgUKuo+7GnR3FX5L7CbveeZc=
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c/go.mod h1:TpUTTEp9frx7rTdLpC9gFG9kdI7zVLFTFFlqaH2Cncw=
golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
+golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
golang.org/x/tools v0.43.1-0.20260407202037-f6476fbaabd3 h1:kKxxg32Xl95dav6werhfwQpDWpSGWR4G43Dj1bkDqlQ=
golang.org/x/tools v0.43.1-0.20260407202037-f6476fbaabd3/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
rsc.io/markdown v0.0.0-20240306144322-0bf8f97ee8ef h1:mqLYrXCXYEZOop9/Dbo6RPX11539nwiCNBb1icVPmw8=
diff --git a/src/cmd/vendor/golang.org/x/sys/windows/dll_windows.go b/src/cmd/vendor/golang.org/x/sys/windows/dll_windows.go
index 3ca814f54d..1157b06d87 100644
--- a/src/cmd/vendor/golang.org/x/sys/windows/dll_windows.go
+++ b/src/cmd/vendor/golang.org/x/sys/windows/dll_windows.go
@@ -163,42 +163,7 @@ func (p *Proc) Addr() uintptr {
// (according to the semantics of the specific function being called) before consulting
// the error. The error will be guaranteed to contain windows.Errno.
func (p *Proc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
- switch len(a) {
- case 0:
- return syscall.Syscall(p.Addr(), uintptr(len(a)), 0, 0, 0)
- case 1:
- return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], 0, 0)
- case 2:
- return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], a[1], 0)
- case 3:
- return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], a[1], a[2])
- case 4:
- return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], 0, 0)
- case 5:
- return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], 0)
- case 6:
- return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5])
- case 7:
- return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], 0, 0)
- case 8:
- return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], 0)
- case 9:
- return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8])
- case 10:
- return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], 0, 0)
- case 11:
- return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], 0)
- case 12:
- return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11])
- case 13:
- return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], 0, 0)
- case 14:
- return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], 0)
- case 15:
- return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14])
- default:
- panic("Call " + p.Name + " with too many arguments " + itoa(len(a)) + ".")
- }
+ return syscall.SyscallN(p.Addr(), a...)
}
// A LazyDLL implements access to a single DLL.
diff --git a/src/cmd/vendor/golang.org/x/sys/windows/security_windows.go b/src/cmd/vendor/golang.org/x/sys/windows/security_windows.go
index a8b0364c7c..6c955cea15 100644
--- a/src/cmd/vendor/golang.org/x/sys/windows/security_windows.go
+++ b/src/cmd/vendor/golang.org/x/sys/windows/security_windows.go
@@ -1438,13 +1438,17 @@ func GetSecurityInfo(handle Handle, objectType SE_OBJECT_TYPE, securityInformati
}
// GetNamedSecurityInfo queries the security information for a given named object and returns the self-relative security
-// descriptor result on the Go heap.
+// descriptor result on the Go heap. The security descriptor might be nil, even when err is nil, if the object exists
+// but has no security descriptor.
func GetNamedSecurityInfo(objectName string, objectType SE_OBJECT_TYPE, securityInformation SECURITY_INFORMATION) (sd *SECURITY_DESCRIPTOR, err error) {
var winHeapSD *SECURITY_DESCRIPTOR
err = getNamedSecurityInfo(objectName, objectType, securityInformation, nil, nil, nil, nil, &winHeapSD)
if err != nil {
return
}
+ if winHeapSD == nil {
+ return nil, nil
+ }
defer LocalFree(Handle(unsafe.Pointer(winHeapSD)))
return winHeapSD.copySelfRelativeSecurityDescriptor(), nil
}
diff --git a/src/cmd/vendor/modules.txt b/src/cmd/vendor/modules.txt
index dfde90a9fa..c99018cdcb 100644
--- a/src/cmd/vendor/modules.txt
+++ b/src/cmd/vendor/modules.txt
@@ -43,7 +43,7 @@ golang.org/x/mod/zip
## explicit; go 1.25.0
golang.org/x/sync/errgroup
golang.org/x/sync/semaphore
-# golang.org/x/sys v0.42.1-0.20260320201212-a76ec62d6c53
+# golang.org/x/sys v0.43.0
## explicit; go 1.25.0
golang.org/x/sys/plan9
golang.org/x/sys/unix
@@ -63,7 +63,7 @@ golang.org/x/telemetry/internal/upload
# golang.org/x/term v0.39.0
## explicit; go 1.24.0
golang.org/x/term
-# golang.org/x/text v0.35.0
+# golang.org/x/text v0.36.0
## explicit; go 1.25.0
golang.org/x/text/cases
golang.org/x/text/internal
diff --git a/src/go.mod b/src/go.mod
index a8ebee0bd2..93578227a2 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -3,11 +3,11 @@ module std
go 1.27
require (
- golang.org/x/crypto v0.49.0
- golang.org/x/net v0.52.1-0.20260406204716-056ac742146a
+ golang.org/x/crypto v0.50.0
+ golang.org/x/net v0.53.1-0.20260410192740-cd64923cd7f4
)
require (
- golang.org/x/sys v0.42.1-0.20260320201212-a76ec62d6c53 // indirect
- golang.org/x/text v0.35.0 // indirect
+ golang.org/x/sys v0.43.0 // indirect
+ golang.org/x/text v0.36.0 // indirect
)
diff --git a/src/go.sum b/src/go.sum
index e5f656652a..c088007f57 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,8 +1,8 @@
-golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
-golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
-golang.org/x/net v0.52.1-0.20260406204716-056ac742146a h1:3li6mFiqneqvrkq+zbxvMG+VdvDQa27vKCR4kx3vmp0=
-golang.org/x/net v0.52.1-0.20260406204716-056ac742146a/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
-golang.org/x/sys v0.42.1-0.20260320201212-a76ec62d6c53 h1:0T1C9w/fKTlj64Z8y0UtRoCAD7UZ+l5ZCSHcs3GYSCI=
-golang.org/x/sys v0.42.1-0.20260320201212-a76ec62d6c53/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
+golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
+golang.org/x/net v0.53.1-0.20260410192740-cd64923cd7f4 h1:YxvMAEWKTqJ1JPwbgY2r7MoIutOit7xTXgoxo887lWQ=
+golang.org/x/net v0.53.1-0.20260410192740-cd64923cd7f4/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
+golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
+golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
+golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
diff --git a/src/vendor/golang.org/x/net/internal/http3/roundtrip.go b/src/vendor/golang.org/x/net/internal/http3/roundtrip.go
index 2ea584b773..29e7016504 100644
--- a/src/vendor/golang.org/x/net/internal/http3/roundtrip.go
+++ b/src/vendor/golang.org/x/net/internal/http3/roundtrip.go
@@ -94,9 +94,13 @@ func (cc *clientConn) RoundTrip(req *http.Request) (_ *http.Response, err error)
return nil, err
}
rt := &roundTripState{
- cc: cc,
- st: st,
- trace: httptrace.ContextClientTrace(req.Context()),
+ cc: cc,
+ st: st,
+ trace: httptrace.ContextClientTrace(req.Context()),
+ reqBody: req.Body,
+ }
+ if rt.reqBody == nil {
+ rt.reqBody = http.NoBody
}
defer func() {
if err != nil {
@@ -244,16 +248,12 @@ func (cc *clientConn) writeBodyAndTrailer(rt *roundTripState, req *http.Request)
declaredTrailer := req.Trailer.Clone()
- rt.reqBody = req.Body
rt.reqBodyWriter.st = rt.st
rt.reqBodyWriter.remain = actualContentLength(req)
rt.reqBodyWriter.flush = true
rt.reqBodyWriter.name = "request"
rt.reqBodyWriter.trailer = req.Trailer
rt.reqBodyWriter.enc = &cc.enc
- if req.Body == nil {
- rt.reqBody = http.NoBody
- }
if _, err := io.Copy(&rt.reqBodyWriter, rt.reqBody); err != nil {
rt.abort(err)
diff --git a/src/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64_other.go b/src/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64_other.go
index 4ee68e38d9..37ecc66440 100644
--- a/src/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64_other.go
+++ b/src/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64_other.go
@@ -6,6 +6,8 @@
package cpu
+import "runtime"
+
func doinit() {
setMinimalFeatures()
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
index c7220124e2..afa1c640fa 100644
--- a/src/vendor/modules.txt
+++ b/src/vendor/modules.txt
@@ -1,4 +1,4 @@
-# golang.org/x/crypto v0.49.0
+# golang.org/x/crypto v0.50.0
## explicit; go 1.25.0
golang.org/x/crypto/chacha20
golang.org/x/crypto/chacha20poly1305
@@ -7,7 +7,7 @@ golang.org/x/crypto/cryptobyte/asn1
golang.org/x/crypto/hkdf
golang.org/x/crypto/internal/alias
golang.org/x/crypto/internal/poly1305
-# golang.org/x/net v0.52.1-0.20260406204716-056ac742146a
+# golang.org/x/net v0.53.1-0.20260410192740-cd64923cd7f4
## explicit; go 1.25.0
golang.org/x/net/dns/dnsmessage
golang.org/x/net/http/httpguts
@@ -21,10 +21,10 @@ golang.org/x/net/internal/quic/quicwire
golang.org/x/net/lif
golang.org/x/net/nettest
golang.org/x/net/quic
-# golang.org/x/sys v0.42.1-0.20260320201212-a76ec62d6c53
+# golang.org/x/sys v0.43.0
## explicit; go 1.25.0
golang.org/x/sys/cpu
-# golang.org/x/text v0.35.0
+# golang.org/x/text v0.36.0
## explicit; go 1.25.0
golang.org/x/text/secure/bidirule
golang.org/x/text/transform