diff options
| author | Marten Seemann <[email protected]> | 2023-05-30 12:41:57 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-05-30 05:41:57 -0400 |
| commit | 467b7e3a9cba9570cc62934316dbd251860fed3f (patch) | |
| tree | 3ee1779b713d460c97224b2064e341f9ec8f5563 | |
| parent | 31d75acc9ca5529c300be1ff46ae2dd799fbf9d8 (diff) | |
| download | caddy-467b7e3a9cba9570cc62934316dbd251860fed3f.tar.gz caddy-467b7e3a9cba9570cc62934316dbd251860fed3f.zip | |
update quic-go to v0.35.0 (#5560)
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 4 | ||||
| -rw-r--r-- | listeners.go | 6 |
3 files changed, 6 insertions, 6 deletions
@@ -17,7 +17,7 @@ require ( github.com/mastercactapus/proxyprotocol v0.0.4 github.com/mholt/acmez v1.1.1 github.com/prometheus/client_golang v1.14.0 - github.com/quic-go/quic-go v0.34.0 + github.com/quic-go/quic-go v0.35.0 github.com/smallstep/certificates v0.24.2 github.com/smallstep/nosql v0.6.0 github.com/smallstep/truststore v0.12.1 @@ -864,8 +864,8 @@ github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc8 github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E= github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= -github.com/quic-go/quic-go v0.34.0 h1:OvOJ9LFjTySgwOTYUZmNoq0FzVicP8YujpV0kB7m2lU= -github.com/quic-go/quic-go v0.34.0/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g= +github.com/quic-go/quic-go v0.35.0 h1:JXIf219xJK+4qGeY52rlnrVqeB2AXUAwfLU9JSoWXwg= +github.com/quic-go/quic-go v0.35.0/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= diff --git a/listeners.go b/listeners.go index 4c851bd1e..672bd833d 100644 --- a/listeners.go +++ b/listeners.go @@ -445,7 +445,7 @@ func ListenPacket(network, addr string) (net.PacketConn, error) { // NOTE: This API is EXPERIMENTAL and may be changed or removed. // // TODO: See if we can find a more elegant solution closer to the new NetworkAddress.Listen API. -func ListenQUIC(ln net.PacketConn, tlsConf *tls.Config, activeRequests *int64) (quic.EarlyListener, error) { +func ListenQUIC(ln net.PacketConn, tlsConf *tls.Config, activeRequests *int64) (http3.QUICEarlyListener, error) { lnKey := listenerKey("quic+"+ln.LocalAddr().Network(), ln.LocalAddr().String()) sharedEarlyListener, _, err := listenerPool.LoadOrNew(lnKey, func() (Destructor, error) { @@ -454,7 +454,7 @@ func ListenQUIC(ln net.PacketConn, tlsConf *tls.Config, activeRequests *int64) ( //nolint:gosec quicTlsConfig := &tls.Config{GetConfigForClient: sqtc.getConfigForClient} earlyLn, err := quic.ListenEarly(ln, http3.ConfigureTLSConfig(quicTlsConfig), &quic.Config{ - Allow0RTT: func(net.Addr) bool { return true }, + Allow0RTT: true, RequireAddressValidation: func(clientAddr net.Addr) bool { var highLoad bool if activeRequests != nil { @@ -569,7 +569,7 @@ func (sqtc *sharedQUICTLSConfig) addTLSConfig(tlsConfig *tls.Config) (context.Co // sharedQuicListener is like sharedListener, but for quic.EarlyListeners. type sharedQuicListener struct { - quic.EarlyListener + *quic.EarlyListener sqtc *sharedQUICTLSConfig key string } |