gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

http3: rename Settings.EnableDatagram to EnableDatagrams (#4466)

Browse Source 
This makes it consistent with the quic.Config and the config flag on the
http3.Server and http3.RoundTripper.
This commit is contained in:
Marten Seemann
2024-04-26 22:35:21 +02:00
committed by GitHub
parent e1e5b6294d
commit 083ceb42f2
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
http3/conn.go
View File

@@ -212,7 +212,7 @@ func (c *connection) HandleUnidirectionalStreams(hijack func(StreamType, quic.Co
return return
} }
c.settings = &Settings{ c.settings = &Settings{
EnableDatagram: sf.Datagram, EnableDatagrams: sf.Datagram,
EnableExtendedConnect: sf.ExtendedConnect, EnableExtendedConnect: sf.ExtendedConnect,
Other: sf.Other, Other: sf.Other,
} }

2
http3/conn_test.go
View File

@@ -47,7 +47,7 @@ var _ = Describe("Connection", func() {
conn.HandleUnidirectionalStreams(nil) conn.HandleUnidirectionalStreams(nil)
}() }()
Eventually(conn.ReceivedSettings()).Should(BeClosed()) Eventually(conn.ReceivedSettings()).Should(BeClosed())
Expect(conn.Settings().EnableDatagram).To(BeTrue()) Expect(conn.Settings().EnableDatagrams).To(BeTrue())
Expect(conn.Settings().EnableExtendedConnect).To(BeTrue()) Expect(conn.Settings().EnableExtendedConnect).To(BeTrue())
Expect(conn.Settings().Other).To(HaveKeyWithValue(uint64(1337), uint64(42))) Expect(conn.Settings().Other).To(HaveKeyWithValue(uint64(1337), uint64(42)))
Eventually(done).Should(BeClosed()) Eventually(done).Should(BeClosed())

2
http3/roundtrip.go
View File

@@ -21,7 +21,7 @@ import (
// Settings are HTTP/3 settings that apply to the underlying connection. // Settings are HTTP/3 settings that apply to the underlying connection.
type Settings struct { type Settings struct {
// Support for HTTP/3 datagrams (RFC 9297) // Support for HTTP/3 datagrams (RFC 9297)
EnableDatagram bool EnableDatagrams bool
// Extended CONNECT, RFC 9220 // Extended CONNECT, RFC 9220
EnableExtendedConnect bool EnableExtendedConnect bool
// Other settings, defined by the application // Other settings, defined by the application

2
http3/roundtrip_test.go
View File

@@ -181,7 +181,7 @@ var _ = Describe("RoundTripper", func() {
Expect(err).To(MatchError(testErr)) Expect(err).To(MatchError(testErr))
}) })
It("requires quic.Config.EnableDatagram if HTTP/3 datagrams are enabled", func() { It("requires quic.Config.EnableDatagrams if HTTP/3 datagrams are enabled", func() {
rt := &RoundTripper{ rt := &RoundTripper{
QUICConfig: &quic.Config{EnableDatagrams: false}, QUICConfig: &quic.Config{EnableDatagrams: false},
EnableDatagrams: true, EnableDatagrams: true,

2
http3/server.go
View File

@@ -167,7 +167,7 @@ type Server struct {
Handler http.Handler Handler http.Handler
// EnableDatagrams enables support for HTTP/3 datagrams (RFC 9297). // EnableDatagrams enables support for HTTP/3 datagrams (RFC 9297).
// If set to true, QUICConfig.EnableDatagram will be set. // If set to true, QUICConfig.EnableDatagrams will be set.
EnableDatagrams bool EnableDatagrams bool
// MaxHeaderBytes controls the maximum number of bytes the server will // MaxHeaderBytes controls the maximum number of bytes the server will

6
integrationtests/self/http_test.go
View File

@@ -611,7 +611,7 @@ var _ = Describe("HTTP tests", func() {
Eventually(hconn.ReceivedSettings(), 5*time.Second, 10*time.Millisecond).Should(BeClosed()) Eventually(hconn.ReceivedSettings(), 5*time.Second, 10*time.Millisecond).Should(BeClosed())
settings := hconn.Settings() settings := hconn.Settings()
Expect(settings.EnableExtendedConnect).To(BeTrue()) Expect(settings.EnableExtendedConnect).To(BeTrue())
Expect(settings.EnableDatagram).To(BeFalse()) Expect(settings.EnableDatagrams).To(BeFalse())
Expect(settings.Other).To(BeEmpty()) Expect(settings.Other).To(BeEmpty())
}) })
@@ -642,7 +642,7 @@ var _ = Describe("HTTP tests", func() {
var settings *http3.Settings var settings *http3.Settings
Expect(settingsChan).To(Receive(&settings)) Expect(settingsChan).To(Receive(&settings))
Expect(settings).ToNot(BeNil()) Expect(settings).ToNot(BeNil())
Expect(settings.EnableDatagram).To(BeTrue()) Expect(settings.EnableDatagrams).To(BeTrue())
Expect(settings.EnableExtendedConnect).To(BeFalse()) Expect(settings.EnableExtendedConnect).To(BeFalse())
Expect(settings.Other).To(HaveKeyWithValue(uint64(1337), uint64(42))) Expect(settings.Other).To(HaveKeyWithValue(uint64(1337), uint64(42)))
}) })
@@ -732,7 +732,7 @@ var _ = Describe("HTTP tests", func() {
Expect(r.Method).To(Equal(http.MethodConnect)) Expect(r.Method).To(Equal(http.MethodConnect))
conn := w.(http3.Hijacker).Connection() conn := w.(http3.Hijacker).Connection()
Eventually(conn.ReceivedSettings()).Should(BeClosed()) Eventually(conn.ReceivedSettings()).Should(BeClosed())
Expect(conn.Settings().EnableDatagram).To(BeTrue()) Expect(conn.Settings().EnableDatagrams).To(BeTrue())
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
w.(http.Flusher).Flush() w.(http.Flusher).Flush()