aboutsummaryrefslogtreecommitdiff
path: root/src/net/http/transport.go
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo@golang.org>2019-08-13 13:16:53 -0400
committerFilippo Valsorda <filippo@golang.org>2019-08-13 13:16:53 -0400
commit83bd88129ea3b5a1272c06db3e865ee75740cee8 (patch)
tree6008f3648df573610fa07eef597b93497aba8356 /src/net/http/transport.go
parent433b76f32a6a845322343dc32309df8e08ca6339 (diff)
parentb2967c0e5c5271bb4469e1f615fb85879ebd8a57 (diff)
downloadgo-83bd88129ea3b5a1272c06db3e865ee75740cee8.tar.gz
go-83bd88129ea3b5a1272c06db3e865ee75740cee8.zip
[release-branch.go1.11] all: merge release-branch.go1.11-security into release-branch.go1.11release-branch.go1.11
Change-Id: Icf6d0fb76112e5a9045d0c03bf86072cfa694e6c
Diffstat (limited to 'src/net/http/transport.go')
-rw-r--r--src/net/http/transport.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/net/http/transport.go b/src/net/http/transport.go
index 40947baf87..0a9812eeda 100644
--- a/src/net/http/transport.go
+++ b/src/net/http/transport.go
@@ -640,6 +640,8 @@ func resetProxyConfig() {
}
func (t *Transport) connectMethodForRequest(treq *transportRequest) (cm connectMethod, err error) {
+ // TODO: the validPort check is redundant after CL 189258, as url.URL.Port
+ // only returns valid ports now. golang.org/issue/33600
if port := treq.URL.Port(); !validPort(port) {
return cm, fmt.Errorf("invalid URL port %q", port)
}