fix: close and drain the response body always (#8847)

This commit is contained in:
Harshavardhana
2020-01-21 02:46:58 -08:00
committed by GitHub
parent 3011692d93
commit e2b3c083aa
9 changed files with 17 additions and 4 deletions

View File

@@ -251,6 +251,7 @@ func parseDiscoveryDoc(u *xnet.URL, transport *http.Transport, closeRespFn func(
}
resp, err := clnt.Do(req)
if err != nil {
clnt.CloseIdleConnections()
return d, err
}
defer closeRespFn(resp.Body)

View File

@@ -304,9 +304,12 @@ func IsBackendOnline(ctx context.Context, clnt *http.Client, urlStr string) bool
if err != nil {
return false
}
if _, err = clnt.Do(req); err != nil {
resp, err := clnt.Do(req)
if err != nil {
clnt.CloseIdleConnections()
return !xnet.IsNetworkOrHostDown(err)
}
xhttp.DrainBody(resp.Body)
return true
}

View File

@@ -66,6 +66,7 @@ func (h *Target) startHTTPLogger() {
resp, err := h.client.Do(req)
if err != nil {
h.client.CloseIdleConnections()
continue
}

View File

@@ -207,6 +207,7 @@ func IsServerResolvable(endpoint Endpoint) error {
resp, err := httpClient.Do(req)
if err != nil {
httpClient.CloseIdleConnections()
return err
}
defer xhttp.DrainBody(resp.Body)

View File

@@ -69,6 +69,7 @@ func (c *Client) CallWithContext(ctx context.Context, method string, values url.
}
resp, err := c.httpClient.Do(req)
if err != nil {
c.httpClient.CloseIdleConnections()
return nil, &NetworkError{err}
}

View File

@@ -2029,6 +2029,7 @@ func (web *webAPIHandlers) LoginSTS(r *http.Request, args *LoginSTSArgs, reply *
resp, err := clnt.Do(req)
if err != nil {
clnt.CloseIdleConnections()
return toJSONError(ctx, err)
}
defer xhttp.DrainBody(resp.Body)