diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2018-08-13 16:00:34 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2018-08-13 18:28:09 +0000 |
| commit | 7a6fc1f30bc7339726cd3f93f96be3e0d36ff7cb (patch) | |
| tree | f7a9ff26f3886c189897f7dcdda44b0ab89b0501 /src/net/http/client.go | |
| parent | 015873c15348628ee871af7ab8f79c941870d6e2 (diff) | |
| download | go-7a6fc1f30bc7339726cd3f93f96be3e0d36ff7cb.tar.xz | |
net/http: update request cancelation docs
Fixes #26101
Change-Id: Id4def032b846257d2de992b7561ac90a17e08b91
Reviewed-on: https://go-review.googlesource.com/129155
Reviewed-by: Andrew Bonventre <andybons@golang.org>
Diffstat (limited to 'src/net/http/client.go')
| -rw-r--r-- | src/net/http/client.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/net/http/client.go b/src/net/http/client.go index fc4a792edd..8f69a298e3 100644 --- a/src/net/http/client.go +++ b/src/net/http/client.go @@ -95,14 +95,12 @@ type Client struct { // A Timeout of zero means no timeout. // // The Client cancels requests to the underlying Transport - // using the Request.Cancel mechanism. Requests passed - // to Client.Do may still set Request.Cancel; both will - // cancel the request. + // as if the Request's Context ended. // // For compatibility, the Client will also use the deprecated // CancelRequest method on Transport if found. New - // RoundTripper implementations should use Request.Cancel - // instead of implementing CancelRequest. + // RoundTripper implementations should use the Request's Context + // for cancelation instead of implementing CancelRequest. Timeout time.Duration } |
