From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Mon, 19 May 2014 17:12:15 +0000 (-0700)
Subject: net/http: document that ProxyFromEnvironment special-cases localhost
X-Git-Tag: go1.3beta2~25
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f0bdee171f2490b2f9638e46cc133644f01a2156;p=gostls13.git

net/http: document that ProxyFromEnvironment special-cases localhost

Fixes #7256

LGTM=r
R=golang-codereviews, r
CC=golang-codereviews, rsc
https://golang.org/cl/97590043
---

diff --git a/src/pkg/net/http/transport.go b/src/pkg/net/http/transport.go
index 2ffc404712..b1cc632a78 100644
--- a/src/pkg/net/http/transport.go
+++ b/src/pkg/net/http/transport.go
@@ -109,6 +109,9 @@ type Transport struct {
 // An error is returned if the proxy environment is invalid.
 // A nil URL and nil error are returned if no proxy is defined in the
 // environment, or a proxy should not be used for the given request.
+//
+// As a special case, if req.URL.Host is "localhost" (with or without
+// a port number), then a nil URL and nil error will be returned.
 func ProxyFromEnvironment(req *Request) (*url.URL, error) {
 	proxy := httpProxyEnv.Get()
 	if proxy == "" {