mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

introduce a http3.RoundTripOpt to prevent closing of request stream (#3411)

Browse source
This commit is contained in:
Marten Seemann 2022-05-20 11:54:31 +02:00 • committed by GitHub
parent 6511723c28
commit de5f08171b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 107 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

15
http3/roundtrip.go
View file

@ -16,7 +16,7 @@ import (
)
type roundTripCloser interface {
http.RoundTripper
RoundTripOpt(*http.Request, RoundTripOpt) (*http.Response, error)
io.Closer
}
@ -77,11 +77,16 @@ type RoundTripper struct {
// RoundTripOpt are options for the Transport.RoundTripOpt method.
type RoundTripOpt struct {
// OnlyCachedConn controls whether the RoundTripper may create a new QUIC connection.
// If set true and no cached connection is available, RoundTrip will return ErrNoCachedConn.
// If set true and no cached connection is available, RoundTripOpt will return ErrNoCachedConn.
OnlyCachedConn bool
// DontCloseRequestStream controls whether the request stream is closed after sending the request.
DontCloseRequestStream bool
}
var _ roundTripCloser = &RoundTripper{}
var (
_ http.RoundTripper = &RoundTripper{}
_ io.Closer = &RoundTripper{}
)
// ErrNoCachedConn is returned when RoundTripper.OnlyCachedConn is set
var ErrNoCachedConn = errors.New("http3: no cached connection was available")
@ -127,7 +132,7 @@ func (r *RoundTripper) RoundTripOpt(req *http.Request, opt RoundTripOpt) (*http.
if err != nil {
return nil, err
}
return cl.RoundTrip(req)
return cl.RoundTripOpt(req, opt)
}
// RoundTrip does a round trip.
@ -135,7 +140,7 @@ func (r *RoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
return r.RoundTripOpt(req, RoundTripOpt{})
}
func (r *RoundTripper) getClient(hostname string, onlyCached bool) (http.RoundTripper, error) {
func (r *RoundTripper) getClient(hostname string, onlyCached bool) (roundTripCloser, error) {
r.mutex.Lock()
defer r.mutex.Unlock()