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

http3: expose an OpenStream method on the RoundTripper (#4409)

Browse Source 
The stream exposes two methods required for doing an HTTP request:
SendRequestHeader and ReadResponse. This can be used by applications
that wish to use the stream for non-HTTP content afterwards. This will
lead to a simplification in the API we need to expose for WebTransport,
and will make it easier to send HTTP Datagrams associated with this
stream.
This commit is contained in:
Marten Seemann
2024-04-09 16:14:14 -04:00
committed by GitHub
parent e310b80cf3
commit eb310a6db8
12 changed files with 434 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
http3/body.go
View File

@@ -107,7 +107,7 @@ func (r *requestBody) Settings(ctx context.Context) (*Settings, error) {
}
type hijackableBody struct {
body
body body
conn quic.Connection // only needed to implement Hijacker
// only set for the http.Response
@@ -120,7 +120,6 @@ type hijackableBody struct {
var (
_ io.ReadCloser = &hijackableBody{}
_ Hijacker = &hijackableBody{}
_ HTTPStreamer = &hijackableBody{}
)
func newResponseBody(str Stream, conn quic.Connection, done chan<- struct{}) *hijackableBody {
@@ -132,7 +131,7 @@ func newResponseBody(str Stream, conn quic.Connection, done chan<- struct{}) *hi
}
func (r *hijackableBody) Read(b []byte) (int, error) {
n, err := r.str.Read(b)
n, err := r.body.str.Read(b)
if err != nil {
r.requestDone()
}
@@ -152,9 +151,8 @@ func (r *hijackableBody) requestDone() {
func (r *hijackableBody) Close() error {
r.requestDone()
// If the EOF was read, CancelRead() is a no-op.
r.str.CancelRead(quic.StreamErrorCode(ErrCodeRequestCanceled))
r.body.str.CancelRead(quic.StreamErrorCode(ErrCodeRequestCanceled))
return nil
}
func (r *hijackableBody) HTTPStream() Stream { return r.str }
func (r *hijackableBody) StreamCreator() StreamCreator { return r.conn }