Merge pull request from thaJeztah/19.03_backport_pass_network_error

[19.03 backport] Check for context error that is wrapped in url.Error
This commit is contained in:
Tibor Vass 2020-09-15 15:56:29 -07:00 committed by GitHub
commit 50b33bd3cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -143,8 +143,7 @@ func (cli *Client) doRequest(ctx context.Context, req *http.Request) (serverResp
// Don't decorate context sentinel errors; users may be comparing to
// them directly.
switch err {
case context.Canceled, context.DeadlineExceeded:
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
return serverResp, err
}