re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Establishing TLS connections respect DialTimeout
This commit is contained in:
Vladimir Mihailenco 2018-06-29 09:21:45 +03:00 committed by GitHub
parent 8a90ef696e 8c513f1b88
commit d409b91714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
options.go
View File

@ -85,12 +85,12 @@ func (opt *Options) init() {
} }
if opt.Dialer == nil { if opt.Dialer == nil {
opt.Dialer = func() (net.Conn, error) { opt.Dialer = func() (net.Conn, error) {
conn, err := net.DialTimeout(opt.Network, opt.Addr, opt.DialTimeout) netDialer := &net.Dialer{Timeout: opt.DialTimeout}
if opt.TLSConfig == nil || err != nil { if opt.TLSConfig == nil {
return conn, err 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 { if opt.PoolSize == 0 {