1. docker
  2. Commit 5974fc25403f149be796c6d69270881854547633
Browse code

client: dial tls on Dialer if tls config is set

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Tonis Tiigi authored on 2018/09/05 07:09:44
Showing 1 changed files
client/client.go
History View file @ 5974fc2
... ... 
@@ -413,7 +413,7 @@ func (cli *Client) SetCustomHTTPHeaders(headers map[string]string) {
413 413 
 func (cli *Client) Dialer() func(context.Context) (net.Conn, error) {
414 414 
 	return func(ctx context.Context) (net.Conn, error) {
415 415 
 		if transport, ok := cli.client.Transport.(*http.Transport); ok {
416 
-			if transport.DialContext != nil {
416 
+			if transport.DialContext != nil && transport.TLSClientConfig == nil {
417 417 
 				return transport.DialContext(ctx, cli.proto, cli.addr)
418 418 
 			}
419 419 
 		}