net/http: use tls host instead of proxy, when checking against a certificate

Fixes #4152.

R=bradfitz
CC=golang-dev
https://golang.org/cl/6570045

diff --git a/src/pkg/net/http/transport.go b/src/pkg/net/http/transport.go
index a33d787f25d958aab58d99cba405844743b045a6..651f3ce0081bf9b5d213b2e8c0d5f4fb18b40fc3 100644 (file)
--- a/src/pkg/net/http/transport.go
+++ b/src/pkg/net/http/transport.go
@@ -381,7 +381,7 @@ func (t *Transport) getConn(cm *connectMethod) (*persistConn, error) {
                // Initiate TLS and check remote host name against certificate.
                cfg := t.TLSClientConfig
                if cfg == nil || cfg.ServerName == "" {
-                       host, _, _ := net.SplitHostPort(cm.addr())
+                       host := cm.tlsHost()
                        if cfg == nil {
                                cfg = &tls.Config{ServerName: host}
                        } else {