@marcel91200 / caddy Mirror · read-only / commits / 467b7e3a
Fork 0

Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS

Mirrored from https://github.com/Slazee/caddy.git

Synced Nov 13, 01:45 UTC

update quic-go to v0.35.0 (#5560)

Marten Seemann committed May 30, 2023 at 12:41 UTC 467b7e3a9cba9570cc62934316dbd251860fed3f
3 files changed +6 -6
go.mod
+1 -1
@@ -17,7 +17,7 @@ require (
17 github.com/mastercactapus/proxyprotocol v0.0.4
18 github.com/mholt/acmez v1.1.1
19 github.com/prometheus/client_golang v1.14.0
20 - github.com/quic-go/quic-go v0.34.0
20 + github.com/quic-go/quic-go v0.35.0
21 github.com/smallstep/certificates v0.24.2
22 github.com/smallstep/nosql v0.6.0
23 github.com/smallstep/truststore v0.12.1
go.sum
+2 -2
@@ -864,8 +864,8 @@ github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc8
864 github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
865 github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E=
866 github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
867 -github.com/quic-go/quic-go v0.34.0 h1:OvOJ9LFjTySgwOTYUZmNoq0FzVicP8YujpV0kB7m2lU=
868 -github.com/quic-go/quic-go v0.34.0/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g=
867 +github.com/quic-go/quic-go v0.35.0 h1:JXIf219xJK+4qGeY52rlnrVqeB2AXUAwfLU9JSoWXwg=
868 +github.com/quic-go/quic-go v0.35.0/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g=
869 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
870 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
871 github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
listeners.go
+3 -3
@@ -445,7 +445,7 @@ func ListenPacket(network, addr string) (net.PacketConn, error) {
445 // NOTE: This API is EXPERIMENTAL and may be changed or removed.
446 //
447 // TODO: See if we can find a more elegant solution closer to the new NetworkAddress.Listen API.
448 -func ListenQUIC(ln net.PacketConn, tlsConf *tls.Config, activeRequests *int64) (quic.EarlyListener, error) {
448 +func ListenQUIC(ln net.PacketConn, tlsConf *tls.Config, activeRequests *int64) (http3.QUICEarlyListener, error) {
449 lnKey := listenerKey("quic+"+ln.LocalAddr().Network(), ln.LocalAddr().String())
450
451 sharedEarlyListener, _, err := listenerPool.LoadOrNew(lnKey, func() (Destructor, error) {
@@ -454,7 +454,7 @@ func ListenQUIC(ln net.PacketConn, tlsConf *tls.Config, activeRequests *int64) (
454 //nolint:gosec
455 quicTlsConfig := &tls.Config{GetConfigForClient: sqtc.getConfigForClient}
456 earlyLn, err := quic.ListenEarly(ln, http3.ConfigureTLSConfig(quicTlsConfig), &quic.Config{
457 - Allow0RTT: func(net.Addr) bool { return true },
457 + Allow0RTT: true,
458 RequireAddressValidation: func(clientAddr net.Addr) bool {
459 var highLoad bool
460 if activeRequests != nil {
@@ -569,7 +569,7 @@ func (sqtc *sharedQUICTLSConfig) addTLSConfig(tlsConfig *tls.Config) (context.Co
569
570 // sharedQuicListener is like sharedListener, but for quic.EarlyListeners.
571 type sharedQuicListener struct {
572 - quic.EarlyListener
572 + *quic.EarlyListener
573 sqtc *sharedQUICTLSConfig
574 key string
575 }