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

http3: implement on the HTTPStreamer on the ResponseWriter, flush header (#4469)

Browse Source 
Currently the HTTPStreamer is implemented on the http.Request.Body. This
complicates usage, since it's not easily possible to flush the HTTP
header, requiring users to manually flash the header before taking over
the stream.

With this change, the HTTP header is now flushed automatically as soon
as HTTPStream is called.
This commit is contained in:
Marten Seemann
2024-04-27 13:30:39 +02:00
committed by GitHub
parent 083ceb42f2
commit 34f4d1443f
5 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
http3/body.go
View File

@@ -8,15 +8,6 @@ import (
"github.com/quic-go/quic-go"
)
// The HTTPStreamer allows taking over a HTTP/3 stream. The interface is implemented by:
// * for the server: the http.Request.Body
// * for the client: the http.Response.Body
// On the client side, the stream will be closed for writing, unless the DontCloseRequestStream RoundTripOpt was set.
// When a stream is taken over, it's the caller's responsibility to close the stream.
type HTTPStreamer interface {
HTTPStream() Stream
}
// A Hijacker allows hijacking of the stream creating part of a quic.Session from a http.Response.Body.
// It is used by WebTransport to create WebTransport streams after a session has been established.
type Hijacker interface {
@@ -32,8 +23,6 @@ type body struct {
remainingContentLength int64
violatedContentLength bool
hasContentLength bool
wasHijacked bool // set when HTTPStream is called
}
func newBody(str *stream, contentLength int64) *body {
@@ -45,15 +34,7 @@ func newBody(str *stream, contentLength int64) *body {
return b
}
func (r *body) HTTPStream() Stream {
r.wasHijacked = true
return r.str
}
func (r *body) StreamID() quic.StreamID { return r.str.StreamID() }
func (r *body) wasStreamHijacked() bool {
return r.wasHijacked
}
func (r *body) checkContentLengthViolation() error {
if !r.hasContentLength {
@@ -97,10 +78,7 @@ type requestBody struct {
getSettings func() *Settings
}
var (
_ io.ReadCloser = &requestBody{}
_ HTTPStreamer = &requestBody{}
)
var _ io.ReadCloser = &requestBody{}
func newRequestBody(str *stream, contentLength int64, connCtx context.Context, rcvdSettings <-chan struct{}, getSettings func() *Settings) *requestBody {
return &requestBody{