diff options
author | Brad Fitzpatrick <bradfitz@golang.org> | 2016-08-22 18:59:20 +0000 |
---|---|---|
committer | Chris Broadfoot <cbro@golang.org> | 2016-09-07 17:47:55 +0000 |
commit | 6f12826a869aa76e4abee4e1e1dfb27b19775782 (patch) | |
tree | d60013b46cf4539a254de005a02fee4b9b28e87b | |
parent | 3129c67db76bc8ee13a1edc38a6c25f9eddcbc6c (diff) | |
download | go-6f12826a869aa76e4abee4e1e1dfb27b19775782.tar.gz go-6f12826a869aa76e4abee4e1e1dfb27b19775782.zip |
[release-branch.go1.7] net/http: make Transport.CancelRequest doc recommend Request.WithContext
The old deprecation docs were referencing another deprecated field.
Fixes #16752
Change-Id: I44a690048e00ddc790a80214ecb7f5bb0a5b7b34
Reviewed-on: https://go-review.googlesource.com/27510
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Reviewed-on: https://go-review.googlesource.com/28638
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
-rw-r--r-- | src/net/http/transport.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net/http/transport.go b/src/net/http/transport.go index 3046de5a8e..66721190de 100644 --- a/src/net/http/transport.go +++ b/src/net/http/transport.go @@ -498,8 +498,9 @@ func (t *Transport) CloseIdleConnections() { // CancelRequest cancels an in-flight request by closing its connection. // CancelRequest should only be called after RoundTrip has returned. // -// Deprecated: Use Request.Cancel instead. CancelRequest cannot cancel -// HTTP/2 requests. +// Deprecated: Use Request.WithContext to create a request with a +// cancelable context instead. CancelRequest cannot cancel HTTP/2 +// requests. func (t *Transport) CancelRequest(req *Request) { t.reqMu.Lock() cancel := t.reqCanceler[req] |