Ver Fonte

Merge pull request #41312 from thaJeztah/19.03_backport_pass_network_error

[19.03 backport] Check for context error that is wrapped in url.Error
Tibor Vass há 4 anos atrás
pai
commit
50b33bd3cd
1 ficheiros alterados com 1 adições e 2 exclusões
  1. 1 2
      client/request.go

+ 1 - 2
client/request.go

@@ -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
 		// Don't decorate context sentinel errors; users may be comparing to
 		// them directly.
 		// them directly.
-		switch err {
-		case context.Canceled, context.DeadlineExceeded:
+		if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
 			return serverResp, err
 			return serverResp, err
 		}
 		}