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

fix leaking request cancelation go routine in case an error occurred

Browse Source
This commit is contained in:
Marten Seemann
2019-09-25 07:21:28 +07:00
parent 9e6bff0b98
commit cc90dfadaf
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
http3/client.go
View File

@@ -152,21 +152,6 @@ func (c *client) RoundTrip(req *http.Request) (*http.Response, error) {
return nil, err return nil, err
} }
rsp, rerr := c.doRequest(req, str)
if rerr.streamErr != 0 {
str.CancelWrite(quic.ErrorCode(rerr.streamErr))
}
if rerr.connErr != 0 {
var reason string
if rerr.err != nil {
reason = rerr.err.Error()
}
c.session.CloseWithError(quic.ErrorCode(rerr.connErr), reason)
}
return rsp, rerr.err
}
func (c *client) doRequest(req *http.Request, str quic.Stream) (*http.Response, requestError) {
// Request Cancellation: // Request Cancellation:
// This go routine keeps running even after RoundTrip() returns. // This go routine keeps running even after RoundTrip() returns.
// It is shut down when the application is done processing the body. // It is shut down when the application is done processing the body.
@@ -180,6 +165,28 @@ func (c *client) doRequest(req *http.Request, str quic.Stream) (*http.Response,
} }
}() }()
rsp, rerr := c.doRequest(req, str, reqDone)
if rerr.err != nil { // if any error occurred
close(reqDone)
if rerr.streamErr != 0 { // if it was a stream error
str.CancelWrite(quic.ErrorCode(rerr.streamErr))
}
if rerr.connErr != 0 { // if it was a connection error
var reason string
if rerr.err != nil {
reason = rerr.err.Error()
}
c.session.CloseWithError(quic.ErrorCode(rerr.connErr), reason)
}
}
return rsp, rerr.err
}
func (c *client) doRequest(
req *http.Request,
str quic.Stream,
reqDone chan struct{},
) (*http.Response, requestError) {
var requestGzip bool var requestGzip bool
if !c.opts.DisableCompression && req.Method != "HEAD" && req.Header.Get("Accept-Encoding") == "" && req.Header.Get("Range") == "" { if !c.opts.DisableCompression && req.Method != "HEAD" && req.Header.Get("Accept-Encoding") == "" && req.Header.Get("Range") == "" {
requestGzip = true requestGzip = true