Skip to content

Commit

Permalink
http3: rename Settings.EnableDatagram to EnableDatagrams
Browse files Browse the repository at this point in the history
This makes it consistent with the quic.Config and the config flag on the
http3.Server and http3.RoundTripper.
  • Loading branch information
marten-seemann committed Apr 26, 2024
1 parent e1e5b62 commit a286382
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion http3/conn.go
Expand Up @@ -212,7 +212,7 @@ func (c *connection) HandleUnidirectionalStreams(hijack func(StreamType, quic.Co
return
}
c.settings = &Settings{
EnableDatagram: sf.Datagram,
EnableDatagrams: sf.Datagram,
EnableExtendedConnect: sf.ExtendedConnect,
Other: sf.Other,
}
Expand Down
2 changes: 1 addition & 1 deletion http3/conn_test.go
Expand Up @@ -47,7 +47,7 @@ var _ = Describe("Connection", func() {
conn.HandleUnidirectionalStreams(nil)
}()
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().Other).To(HaveKeyWithValue(uint64(1337), uint64(42)))
Eventually(done).Should(BeClosed())
Expand Down
2 changes: 1 addition & 1 deletion http3/roundtrip.go
Expand Up @@ -21,7 +21,7 @@ import (
// Settings are HTTP/3 settings that apply to the underlying connection.
type Settings struct {
// Support for HTTP/3 datagrams (RFC 9297)
EnableDatagram bool
EnableDatagrams bool
// Extended CONNECT, RFC 9220
EnableExtendedConnect bool
// Other settings, defined by the application
Expand Down
2 changes: 1 addition & 1 deletion http3/roundtrip_test.go
Expand Up @@ -181,7 +181,7 @@ var _ = Describe("RoundTripper", func() {
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{
QUICConfig: &quic.Config{EnableDatagrams: false},
EnableDatagrams: true,
Expand Down
2 changes: 1 addition & 1 deletion http3/server.go
Expand Up @@ -167,7 +167,7 @@ type Server struct {
Handler http.Handler

// 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

// MaxHeaderBytes controls the maximum number of bytes the server will
Expand Down
6 changes: 3 additions & 3 deletions integrationtests/self/http_test.go
Expand Up @@ -611,7 +611,7 @@ var _ = Describe("HTTP tests", func() {
Eventually(hconn.ReceivedSettings(), 5*time.Second, 10*time.Millisecond).Should(BeClosed())
settings := hconn.Settings()
Expect(settings.EnableExtendedConnect).To(BeTrue())
Expect(settings.EnableDatagram).To(BeFalse())
Expect(settings.EnableDatagrams).To(BeFalse())
Expect(settings.Other).To(BeEmpty())
})

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

Expand Down

0 comments on commit a286382

Please sign in to comment.