Merge pull request redis#798 from josh-tepper/tls-respects-dial-timeout

Establishing TLS connections respect DialTimeout
phpip · Jun 29, 2018 · d409b91 · d409b91
2 parents 8a90ef6 + 8c513f1
commit d409b91
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/options.go b/options.go
@@ -85,12 +85,12 @@ func (opt *Options) init() {
 	}
 	if opt.Dialer == nil {
 		opt.Dialer = func() (net.Conn, error) {
-			conn, err := net.DialTimeout(opt.Network, opt.Addr, opt.DialTimeout)
-			if opt.TLSConfig == nil || err != nil {
-				return conn, err
+			netDialer := &net.Dialer{Timeout: opt.DialTimeout}
+			if opt.TLSConfig == nil {
+				return netDialer.Dial(opt.Network, opt.Addr)
+			} else {
+				return tls.DialWithDialer(netDialer, opt.Network, opt.Addr, opt.TLSConfig)
 			}
-			t := tls.Client(conn, opt.TLSConfig)
-			return t, t.Handshake()
 		}
 	}
 	if opt.PoolSize == 0 {