summaryrefslogtreecommitdiff
path: root/src/net/http/transport.go
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo@golang.org>2020-02-04 17:53:10 -0500
committerFilippo Valsorda <filippo@golang.org>2020-02-04 17:53:10 -0500
commitf74e68136cf1ab178c8a773ac7eafc522260f7db (patch)
treec7162dd29b0b4047a70c92e248525ac3450ce2e9 /src/net/http/transport.go
parent5d9d84d037da727dddca419120d6ce1ea77f92d3 (diff)
parentdeac3221fc4cd365fb40d269dd56551e9d354356 (diff)
downloadgo-git-f74e68136cf1ab178c8a773ac7eafc522260f7db.tar.gz
[dev.boringcrypto.go1.12] all: merge go1.12.16 into dev.boringcrypto.go1.12
Change-Id: I4e773f39dc51294fd43d1478fce54d286f8e2805
Diffstat (limited to 'src/net/http/transport.go')
-rw-r--r--src/net/http/transport.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/net/http/transport.go b/src/net/http/transport.go
index e946760963..df41cbd774 100644
--- a/src/net/http/transport.go
+++ b/src/net/http/transport.go
@@ -1309,15 +1309,16 @@ func (t *Transport) dialConn(ctx context.Context, cm connectMethod) (*persistCon
if hdr == nil {
hdr = make(Header)
}
+ if pa := cm.proxyAuth(); pa != "" {
+ hdr = hdr.clone()
+ hdr.Set("Proxy-Authorization", pa)
+ }
connectReq := &Request{
Method: "CONNECT",
URL: &url.URL{Opaque: cm.targetAddr},
Host: cm.targetAddr,
Header: hdr,
}
- if pa := cm.proxyAuth(); pa != "" {
- connectReq.Header.Set("Proxy-Authorization", pa)
- }
connectReq.Write(conn)
// Read response.