Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2026-06-28 03:40:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

all: update to x/net@689f70a42a

Browse source 
This brings in CL 774943 and CL 774800.

For #78737

Change-Id: I2366e50e93d080ba9799812000fd8be26a6a6964
Reviewed-on: https://go-review.googlesource.com/c/go/+/775460
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Nicholas Husin <husin@google.com>
LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Nicholas S. Husin 2026-05-07 15:34:29 -04:00 • committed by Nicholas Husin
parent 1a9af07120
commit 4d7ac7ff23
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/go.mod
View file

@ -4,7 +4,7 @@ go 1.27
require (
golang.org/x/crypto v0.50.0
golang.org/x/net v0.53.1-0.20260505181449-5e11a5ab891c
golang.org/x/net v0.53.1-0.20260507172500-689f70a42abd
)
require (

4
src/go.sum
View file

@ -1,7 +1,7 @@
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.20260505181449-5e11a5ab891c h1:wrF5RobEIw4Wj2wvtEac1FCXJLWmFGe+ZolWSwFYN5s=
golang.org/x/net v0.53.1-0.20260505181449-5e11a5ab891c/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
golang.org/x/net v0.53.1-0.20260507172500-689f70a42abd h1:fdoEg/JbXgrgSi4eGFGDWLptqZ8qxc8cMoAPCIrA3sA=
golang.org/x/net v0.53.1-0.20260507172500-689f70a42abd/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=

7
src/vendor/golang.org/x/net/http3/http3.go generated vendored
View file

@ -6,12 +6,17 @@ package http3
import (
"net/http"
"time"
_ "unsafe" // for linkname
. "golang.org/x/net/internal/http3"
"golang.org/x/net/quic"
)
// Be extra generous with the handshake timeout. On some builders, the default
// handshake timeout seems to be insufficient, causing rare test flakes.
const handshakeTimeout = 1 * time.Minute
//go:linkname registerHTTP3Server net/http_test.registerHTTP3Server
func registerHTTP3Server(s *http.Server) <-chan *quic.Endpoint {
endpointCh := make(chan *quic.Endpoint)
@ -21,6 +26,7 @@ func registerHTTP3Server(s *http.Server) <-chan *quic.Endpoint {
endpointCh <- e
return e, err
},
QUICConfig: &quic.Config{HandshakeTimeout: handshakeTimeout},
})
return endpointCh
}
@ -34,6 +40,7 @@ func registerHTTP3Transport(tr *http.Transport) <-chan *quic.Endpoint {
endpointCh <- e
return e, err
},
QUICConfig: &quic.Config{HandshakeTimeout: handshakeTimeout},
})
return endpointCh
}

2
src/vendor/golang.org/x/net/quic/stream.go generated vendored
View file

@ -1013,7 +1013,7 @@ func (s *Stream) appendOutFramesLocked(w *packetWriter, pnum packetNumber, pto b
if s.outreset.isSet() {
// RESET_STREAM
if s.outreset.shouldSendPTO(pto) {
if !w.appendResetStreamFrame(s.id, s.outresetcode, min(s.outwin, s.out.end)) {
if !w.appendResetStreamFrame(s.id, s.outresetcode, s.outmaxsent) {
return false
}
s.outreset.setSent(pnum)

2
src/vendor/modules.txt vendored
View file

@ -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.53.1-0.20260505181449-5e11a5ab891c
# golang.org/x/net v0.53.1-0.20260507172500-689f70a42abd
## explicit; go 1.25.0
golang.org/x/net/dns/dnsmessage
golang.org/x/net/http/httpguts