From 5b0bf9db8e0d735551ecec40cc374121b6e6a6ba Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 20 Jun 2013 11:58:24 -0700 Subject: [PATCH] net/http: fix confusing shadowing in ProxyFromEnvironment The old code worked, somewhat on accident, but was confusing, and had a useless assignment to the inner err. It worked because url.Parse parses just about anything, so the outer err was always nil, so it always fell through to the bottom return statement, even without the "err = nil" line. Instead, just have two return statements, and add a comment. R=golang-dev, r CC=golang-dev https://golang.org/cl/10448044 --- src/pkg/net/http/transport.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pkg/net/http/transport.go b/src/pkg/net/http/transport.go index 41ac7dea14..bd2106593b 100644 --- a/src/pkg/net/http/transport.go +++ b/src/pkg/net/http/transport.go @@ -109,9 +109,11 @@ func ProxyFromEnvironment(req *Request) (*url.URL, error) { } proxyURL, err := url.Parse(proxy) if err != nil || !strings.HasPrefix(proxyURL.Scheme, "http") { - if u, err := url.Parse("http://" + proxy); err == nil { - proxyURL = u - err = nil + // proxy was bogus. Try prepending "http://" to it and + // see if that parses correctly. If not, we fall + // through and complain about the original one. + if proxyURL, err := url.Parse("http://" + proxy); err == nil { + return proxyURL, nil } } if err != nil { -- 2.48.1