diff options
| author | Roger Peppe <rogpeppe@gmail.com> | 2017-10-04 19:28:59 +0100 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2018-05-29 21:54:57 +0000 |
| commit | 210a9e0c7dbe9bc16522387e7a0c902d29a5f85c (patch) | |
| tree | d1eb5200a686afd44d93be3c129525c1429e03f9 /src/net/http/export_test.go | |
| parent | b28e33d371cf96f6f34bbc576b6fd95468ea25bc (diff) | |
| download | go-210a9e0c7dbe9bc16522387e7a0c902d29a5f85c.tar.xz | |
net/http: vendor x/net/http/httpproxy, use it in net/http
From x/net git rev c7086645de2.
Updates #16704
Change-Id: I4d642478fc69a52c973964845fca2fd402716e57
Reviewed-on: https://go-review.googlesource.com/68091
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/net/http/export_test.go')
| -rw-r--r-- | src/net/http/export_test.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/net/http/export_test.go b/src/net/http/export_test.go index 1825acd9be..e0ceb40021 100644 --- a/src/net/http/export_test.go +++ b/src/net/http/export_test.go @@ -76,9 +76,7 @@ func NewTestTimeoutHandler(handler Handler, ch <-chan time.Time) Handler { } func ResetCachedEnvironment() { - httpProxyEnv.reset() - httpsProxyEnv.reset() - noProxyEnv.reset() + resetProxyConfig() } func (t *Transport) NumPendingRequestsForTesting() int { |