Skip to content

Commit e2dd0e0

Browse files
committed
⬆️ Upgrade quick-go for Golang release
1 parent 96b65f1 commit e2dd0e0

File tree

4 files changed

+23
-22
lines changed

4 files changed

+23
-22
lines changed

cycletls/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/Danny-Dasilva/fhttp v0.0.0-20240217042913-eeeb0b347ce1
99
github.com/andybalholm/brotli v1.2.0
1010
github.com/gorilla/websocket v1.5.1
11-
github.com/quic-go/quic-go v0.41.0
11+
github.com/quic-go/quic-go v0.53.0
1212
github.com/refraction-networking/uquic v0.0.6
1313
github.com/refraction-networking/utls v1.8.0
1414
golang.org/x/net v0.42.0
@@ -23,7 +23,7 @@ require (
2323
github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 // indirect
2424
github.com/klauspost/compress v1.18.0 // indirect
2525
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
26-
github.com/quic-go/qpack v0.4.0 // indirect
26+
github.com/quic-go/qpack v0.5.1 // indirect
2727
go.uber.org/automaxprocs v1.6.0 // indirect
2828
go.uber.org/mock v0.5.2 // indirect
2929
golang.org/x/crypto v0.40.0 // indirect

cycletls/go.sum

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,13 @@ github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
161161
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
162162
github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
163163
github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
164-
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
165164
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
165+
github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
166+
github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
166167
github.com/quic-go/qtls-go1-20 v0.3.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
167168
github.com/quic-go/quic-go v0.37.4/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU=
168-
github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k=
169-
github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA=
169+
github.com/quic-go/quic-go v0.53.0 h1:QHX46sISpG2S03dPeZBgVIZp8dGagIaiu2FiVYvpCZI=
170+
github.com/quic-go/quic-go v0.53.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY=
170171
github.com/refraction-networking/uquic v0.0.6 h1:9ol1oOaOpHDeeDlBY7u228jK+T5oic35QrFimHVaCMM=
171172
github.com/refraction-networking/uquic v0.0.6/go.mod h1:TFgTmV/yqVCMEXVwP7z7PMAhzye02rFHLV6cRAg59jc=
172173
github.com/refraction-networking/utls v1.5.4/go.mod h1:SPuDbBmgLGp8s+HLNc83FuavwZCFoMmExj+ltUHiHUw=

cycletls/http3.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ func (t *UQuicHTTP3Transport) RoundTrip(req *http.Request) (*http.Response, erro
111111

112112
// Create standard HTTP/3 client as fallback
113113
client := &stdhttp.Client{
114-
Transport: &http3.RoundTripper{
114+
Transport: &http3.Transport{
115115
TLSClientConfig: t.TLSClientConfig,
116-
QuicConfig: &quic.Config{
116+
QUICConfig: &quic.Config{
117117
HandshakeIdleTimeout: 30 * time.Second,
118118
MaxIdleTimeout: 90 * time.Second,
119119
KeepAlivePeriod: 15 * time.Second,
@@ -219,9 +219,9 @@ func (t *HTTP3Transport) RoundTrip(req *http.Request) (*http.Response, error) {
219219

220220
// Create an HTTP/3 client
221221
client := &stdhttp.Client{
222-
Transport: &http3.RoundTripper{
222+
Transport: &http3.Transport{
223223
TLSClientConfig: t.TLSClientConfig,
224-
QuicConfig: t.QuicConfig,
224+
QUICConfig: t.QuicConfig,
225225
},
226226
}
227227

@@ -259,9 +259,9 @@ func (t *HTTP3Transport) RoundTrip(req *http.Request) (*http.Response, error) {
259259

260260
// ConfigureHTTP3Client configures an http.Client to use HTTP/3
261261
func ConfigureHTTP3Client(client *stdhttp.Client, tlsConfig *tls.Config) {
262-
client.Transport = &http3.RoundTripper{
262+
client.Transport = &http3.Transport{
263263
TLSClientConfig: tlsConfig,
264-
QuicConfig: &quic.Config{
264+
QUICConfig: &quic.Config{
265265
HandshakeIdleTimeout: 30 * time.Second,
266266
MaxIdleTimeout: 90 * time.Second,
267267
KeepAlivePeriod: 15 * time.Second,
@@ -277,11 +277,11 @@ type HTTP3RoundTripper struct {
277277
// QuicConfig is the QUIC configuration
278278
QuicConfig *quic.Config
279279

280-
// Forwarder is the underlying HTTP/3 round tripper
281-
Forwarder *http3.RoundTripper
280+
// Forwarder is the underlying HTTP/3 transport
281+
Forwarder *http3.Transport
282282

283283
// Dialer is the custom dialer for HTTP/3 connections
284-
Dialer func(ctx context.Context, addr string, tlsCfg *tls.Config, cfg *quic.Config) (quic.EarlyConnection, error)
284+
Dialer func(ctx context.Context, addr string, tlsCfg *tls.Config, cfg *quic.Config) (*quic.Conn, error)
285285
}
286286

287287
// NewHTTP3RoundTripper creates a new HTTP/3 round tripper with custom fingerprinting
@@ -292,9 +292,9 @@ func NewHTTP3RoundTripper(tlsConfig *tls.Config, quicConfig *quic.Config) *HTTP3
292292
}
293293

294294
// Create the forwarder with default dialer
295-
rt.Forwarder = &http3.RoundTripper{
295+
rt.Forwarder = &http3.Transport{
296296
TLSClientConfig: tlsConfig,
297-
QuicConfig: quicConfig,
297+
QUICConfig: quicConfig,
298298
}
299299

300300
return rt
@@ -337,9 +337,9 @@ func (rt *HTTP3RoundTripper) RoundTrip(req *http.Request) (*http.Response, error
337337
}
338338

339339
// Create a custom HTTP/3 client with our dialer
340-
customRT := &http3.RoundTripper{
340+
customRT := &http3.Transport{
341341
TLSClientConfig: rt.TLSClientConfig,
342-
QuicConfig: rt.QuicConfig,
342+
QUICConfig: rt.QuicConfig,
343343
Dial: rt.Dialer,
344344
}
345345

@@ -394,7 +394,7 @@ func (rt *HTTP3RoundTripper) RoundTrip(req *http.Request) (*http.Response, error
394394

395395
// HTTP3Connection represents an HTTP/3 connection with associated metadata
396396
type HTTP3Connection struct {
397-
QuicConn interface{} // Can be quic.EarlyConnection or uquic.EarlyConnection
397+
QuicConn interface{} // Can be *quic.Conn or uquic.EarlyConnection
398398
RawConn net.PacketConn
399399
Proxys []string
400400
IsUQuic bool // Flag to indicate if this is a UQuic connection

cycletls/roundtripper.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,10 @@ func (rt *roundTripper) makeHTTP3Request(req *http.Request, conn *HTTP3Connectio
582582
tlsConfig = &tls.Config{}
583583
}
584584

585-
// Create HTTP/3 RoundTripper - let it establish its own connections for now
586-
roundTripper := &http3.RoundTripper{
585+
// Create HTTP/3 Transport - let it establish its own connections for now
586+
roundTripper := &http3.Transport{
587587
TLSClientConfig: tlsConfig,
588-
QuicConfig: &quic.Config{
588+
QUICConfig: &quic.Config{
589589
HandshakeIdleTimeout: 30 * time.Second,
590590
MaxIdleTimeout: 90 * time.Second,
591591
KeepAlivePeriod: 15 * time.Second,

0 commit comments

Comments
 (0)