From e6b5db0c0486a2a2097c3de562bbb5730c657fb4 Mon Sep 17 00:00:00 2001 From: Robin Thellend Date: Fri, 3 May 2024 16:17:39 -0700 Subject: [PATCH] http3: pass original Conn to ConnContext (#4480) * http3: Pass original Conn to ConnContext https://github.com/quic-go/quic-go/issues/4479 * Update test to check conn value --- http3/server.go | 2 +- http3/server_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/http3/server.go b/http3/server.go index f7ca9babd2d..7a16c6a857d 100644 --- a/http3/server.go +++ b/http3/server.go @@ -537,7 +537,7 @@ func (s *Server) handleRequest(conn *connection, str quic.Stream, datagrams *dat ctx = context.WithValue(ctx, http.LocalAddrContextKey, conn.LocalAddr()) ctx = context.WithValue(ctx, RemoteAddrContextKey, conn.RemoteAddr()) if s.ConnContext != nil { - ctx = s.ConnContext(ctx, conn) + ctx = s.ConnContext(ctx, conn.Connection) if ctx == nil { panic("http3: ConnContext returned nil") } diff --git a/http3/server_test.go b/http3/server_test.go index 1a30e9f74a6..d7767144766 100644 --- a/http3/server_test.go +++ b/http3/server_test.go @@ -169,7 +169,7 @@ var _ = Describe("Server", func() { Expect(req.Host).To(Equal("www.example.com")) Expect(req.RemoteAddr).To(Equal("127.0.0.1:1337")) Expect(req.Context().Value(ServerContextKey)).To(Equal(s)) - Expect(req.Context().Value(testConnContextKey("test"))).ToNot(Equal(nil)) + Expect(req.Context().Value(testConnContextKey("test"))).To(Equal(conn.Connection)) }) It("returns 200 with an empty handler", func() {