Use datastream context for requests

This commit is contained in:
Thomas De Keulenaer
2017-08-21 17:20:55 +02:00
parent 55a8979bd5
commit 51be240488
2 changed files with 2 additions and 2 deletions

View File

@@ -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") }

View File

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