diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2016-08-30 01:09:32 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-08-30 02:06:07 +0000 |
| commit | 2af00eb63cde716b59c0d64f4c3855b83a9d5a63 (patch) | |
| tree | 4b04dc8dda78d662af0c28bc029f42fa5443bcde /src/net/http/client.go | |
| parent | 6f43a989b0701ef2f87827dc72ee93378e09bb9b (diff) | |
| download | go-2af00eb63cde716b59c0d64f4c3855b83a9d5a63.tar.xz | |
net/http: stop timeout timer if user cancels a request
Change-Id: I84faeae69f294b9a70e545faac6a070feba67770
Reviewed-on: https://go-review.googlesource.com/28074
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Andrew Gerrand <adg@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/net/http/client.go')
| -rw-r--r-- | src/net/http/client.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/net/http/client.go b/src/net/http/client.go index 58b584c8ab..facfb41e38 100644 --- a/src/net/http/client.go +++ b/src/net/http/client.go @@ -329,6 +329,7 @@ func setRequestCancel(req *Request, rt RoundTripper, deadline time.Time) (stopTi select { case <-initialReqCancel: doCancel() + timer.Stop() case <-timer.C: doCancel() case <-stopTimerCh: |