docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #242 from vieux/fix_tls_proxy 

fix tls in proxy func
This commit is contained in:
Andrea Luzzardi 2015-01-14 14:59:59 +01:00
parent 61081ec6d2 0885c7b5b8
commit a403a99c1c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/utils.go
View File

@ -45,14 +45,12 @@ func proxy(tlsConfig *tls.Config, container *cluster.Container, w http.ResponseW
// RequestURI may not be sent to client // RequestURI may not be sent to client
r.RequestURI = "" r.RequestURI = ""
parts := strings.SplitN(container.Node.Addr, "://", 2) if tlsConfig != nil {
if len(parts) == 2 { r.URL.Scheme = "https"
r.URL.Scheme = parts[0]
r.URL.Host = parts[1]
} else { } else {
r.URL.Scheme = "http" r.URL.Scheme = "http"
r.URL.Host = parts[0]
} }
r.URL.Host = container.Node.Addr
log.Debugf("[PROXY] --> %s %s", r.Method, r.URL) log.Debugf("[PROXY] --> %s %s", r.Method, r.URL)
resp, err := client.Do(r) resp, err := client.Do(r)