From 89da709cb784b900145099cc638bbe8e26268ecc Mon Sep 17 00:00:00 2001 From: Evgeniy Makhrov Date: Mon, 3 Aug 2020 15:59:22 +0300 Subject: [PATCH] Check for context error that is wrapped in url.Error Signed-off-by: Evgeniy Makhrov (cherry picked from commit 8ccb46a521964ab80490318504d6e02ae766a912) Signed-off-by: Sebastiaan van Stijn --- client/request.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/request.go b/client/request.go index 2610338da6..44e0a22c4f 100644 --- a/client/request.go +++ b/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 // them directly. - switch err { - case context.Canceled, context.DeadlineExceeded: + if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) { return serverResp, err }