From 51be2404889a2f7faf7050b27fab004dca0293e9 Mon Sep 17 00:00:00 2001 From: Thomas De Keulenaer Date: Mon, 21 Aug 2017 17:20:55 +0200 Subject: [PATCH] Use datastream context for requests --- h2quic/response_writer_test.go | 2 +- h2quic/server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/h2quic/response_writer_test.go b/h2quic/response_writer_test.go index 735dbd03f..2702f8599 100644 --- a/h2quic/response_writer_test.go +++ b/h2quic/response_writer_test.go @@ -38,7 +38,7 @@ func (s *mockStream) Close() error { s.closed = true; r func (s *mockStream) Reset(error) { s.reset = true } func (s *mockStream) CloseRemote(offset protocol.ByteCount) { s.remoteClosed = true } func (s mockStream) StreamID() protocol.StreamID { return s.id } -func (s *mockStream) Context() context.Context { panic("not implemented") } +func (s *mockStream) Context() context.Context { return context.Background() } func (s *mockStream) SetDeadline(time.Time) error { panic("not implemented") } func (s *mockStream) SetReadDeadline(time.Time) error { panic("not implemented") } func (s *mockStream) SetWriteDeadline(time.Time) error { panic("not implemented") } diff --git a/h2quic/server.go b/h2quic/server.go index 3fb072dc8..7b88d2736 100644 --- a/h2quic/server.go +++ b/h2quic/server.go @@ -170,7 +170,6 @@ func (s *Server) handleRequest(session streamCreator, headerStream quic.Stream, return err } - req.WithContext(session.Context()) req.RemoteAddr = session.RemoteAddr().String() if utils.Debug() { @@ -195,6 +194,7 @@ func (s *Server) handleRequest(session streamCreator, headerStream quic.Stream, _, _ = dataStream.Read([]byte{0}) // read the eof } + req = req.WithContext(dataStream.Context()) reqBody := newRequestBody(dataStream) req.Body = reqBody