From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Tue, 30 Aug 2016 01:09:32 +0000 (+0000)
Subject: net/http: stop timeout timer if user cancels a request
X-Git-Tag: go1.8beta1~1578
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2af00eb63cde716b59c0d64f4c3855b83a9d5a63;p=gostls13.git

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>
---

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: