Skip to content

Commit

Permalink
update to quic-go v0.43.0 (unreleased)
Browse files Browse the repository at this point in the history
  • Loading branch information
marten-seemann committed Apr 1, 2024
1 parent 2ce8e10 commit 1d50efb
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ func (d *Dialer) init() {
d.conns.AddUniStream(conn, str)
return true
}
if d.QuicConfig == nil {
d.QuicConfig = &quic.Config{EnableDatagrams: true}
if d.QUICConfig == nil {
d.QUICConfig = &quic.Config{EnableDatagrams: true}
}
if d.QuicConfig.MaxIncomingStreams == 0 {
d.QuicConfig.MaxIncomingStreams = 100
if d.QUICConfig.MaxIncomingStreams == 0 {
d.QUICConfig.MaxIncomingStreams = 100
}
}

Expand All @@ -91,8 +91,8 @@ func (d *Dialer) Dial(ctx context.Context, urlStr string, reqHdr http.Header) (*

// Technically, this is not true. DATAGRAMs could be sent using the Capsule protocol.
// However, quic-go currently enforces QUIC datagram support if HTTP/3 datagrams are enabled.
if !d.QuicConfig.EnableDatagrams {
return nil, nil, errors.New("WebTransport requires DATAGRAM support, enable it via QuicConfig.EnableDatagrams")
if !d.QUICConfig.EnableDatagrams {
return nil, nil, errors.New("WebTransport requires DATAGRAM support, enable it via QUICConfig.EnableDatagrams")
}

u, err := url.Parse(urlStr)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/quic-go/webtransport-go
go 1.21

require (
github.com/quic-go/quic-go v0.42.0
github.com/quic-go/quic-go v0.42.1-0.20240331214500-18d6d2934bdf
github.com/stretchr/testify v1.8.0
go.uber.org/mock v0.4.0
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7q
github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM=
github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
github.com/quic-go/quic-go v0.42.1-0.20240331214500-18d6d2934bdf h1:1BM0KoDMdB5ZtRX45nKohxeGL0UOmRGvjc7gthtTcAM=
github.com/quic-go/quic-go v0.42.1-0.20240331214500-18d6d2934bdf/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
Expand Down
8 changes: 4 additions & 4 deletions webtransport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func establishSession(t *testing.T, handler func(*webtransport.Session)) (sess *
s := &webtransport.Server{
H3: http3.Server{
TLSConfig: tlsConf,
QuicConfig: &quic.Config{Tracer: getQlogger(t), EnableDatagrams: true},
QUICConfig: &quic.Config{Tracer: getQlogger(t), EnableDatagrams: true},
},
}
addHandler(t, s, handler)
Expand All @@ -80,7 +80,7 @@ func establishSession(t *testing.T, handler func(*webtransport.Session)) (sess *
d := webtransport.Dialer{
RoundTripper: &http3.RoundTripper{
TLSClientConfig: &tls.Config{RootCAs: certPool},
QuicConfig: &quic.Config{Tracer: getQlogger(t), EnableDatagrams: true},
QUICConfig: &quic.Config{Tracer: getQlogger(t), EnableDatagrams: true},
},
}
defer d.Close()
Expand Down Expand Up @@ -344,7 +344,7 @@ func TestMultipleClients(t *testing.T) {
d := webtransport.Dialer{
RoundTripper: &http3.RoundTripper{
TLSClientConfig: &tls.Config{RootCAs: certPool},
QuicConfig: &quic.Config{Tracer: getQlogger(t), EnableDatagrams: true},
QUICConfig: &quic.Config{Tracer: getQlogger(t), EnableDatagrams: true},
},
}
defer d.Close()
Expand Down Expand Up @@ -524,7 +524,7 @@ func TestCheckOrigin(t *testing.T) {
d := webtransport.Dialer{
RoundTripper: &http3.RoundTripper{
TLSClientConfig: &tls.Config{RootCAs: certPool},
QuicConfig: &quic.Config{Tracer: getQlogger(t), EnableDatagrams: true},
QUICConfig: &quic.Config{Tracer: getQlogger(t), EnableDatagrams: true},
},
}
defer d.Close()
Expand Down

0 comments on commit 1d50efb

Please sign in to comment.