github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

url.URL.Host now canonical before use in spdy roundtripper.

pull/6/head
Steve Milner 2015-09-04 10:15:35 -04:00
parent 9f1bd07322
commit 6439486512
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/util/httpstream/spdy/roundtripper.go
View File

@ -79,11 +79,14 @@ func (s *SpdyRoundTripper) dial(req *http.Request) (net.Conn, error) {
return s.dialWithoutProxy(req.URL) return s.dialWithoutProxy(req.URL)
} }
// ensure we use a canonical host with proxyReq
targetHost := netutil.CanonicalAddr(req.URL)
// proxying logic adapted from http://blog.h6t.eu/post/74098062923/golang-websocket-with-http-proxy-support // proxying logic adapted from http://blog.h6t.eu/post/74098062923/golang-websocket-with-http-proxy-support
proxyReq := http.Request{ proxyReq := http.Request{
Method: "CONNECT", Method: "CONNECT",
URL: &url.URL{}, URL: &url.URL{},
Host: req.URL.Host, Host: targetHost,
} }
proxyDialConn, err := s.dialWithoutProxy(proxyURL) proxyDialConn, err := s.dialWithoutProxy(proxyURL)