summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2017-01-05 18:10:19 +0000
committerBrad Fitzpatrick <bradfitz@golang.org>2017-01-05 18:29:19 +0000
commit7d977e42797aa51a3867dee5a60031becb9a9d40 (patch)
tree6ca0e0084c7d5690a52c1e00cab5b2f6853f4bdf
parentb820ef5c33c1b508c7b0df8827b6f13c9480acea (diff)
downloadgo-git-7d977e42797aa51a3867dee5a60031becb9a9d40.tar.gz
cmd/go: use ProxyFromEnvironment in -insecure mode also
Be consistent on whether the http proxy environment variables are respected regardless of whether -insecure is used. Updates #18519 Change-Id: Ib157eaacfd342dd3bfcd03e64da18c98c609cae3 Reviewed-on: https://go-review.googlesource.com/34818 Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> Reviewed-by: Russ Cox <rsc@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
-rw-r--r--src/cmd/go/http.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cmd/go/http.go b/src/cmd/go/http.go
index 1dc2c12c64..dcb4e9fea5 100644
--- a/src/cmd/go/http.go
+++ b/src/cmd/go/http.go
@@ -33,6 +33,7 @@ var httpClient = http.DefaultClient
var impatientInsecureHTTPClient = &http.Client{
Timeout: 5 * time.Second,
Transport: &http.Transport{
+ Proxy: http.ProxyFromEnvironment,
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
},