Avoid copying tls.Config lock

Fixes #90
This commit is contained in:
Mickael Remond
2019-07-15 18:40:20 +02:00
parent 9577036327
commit d36428fb2f
2 changed files with 7 additions and 3 deletions

View File

@@ -117,8 +117,10 @@ func (s *Session) startTlsIfSupported(conn net.Conn, domain string, o Config) ne
return conn
}
o.TLSConfig.ServerName = domain
tlsConn := tls.Client(conn, &o.TLSConfig)
if o.TLSConfig.ServerName == "" {
o.TLSConfig.ServerName = domain
}
tlsConn := tls.Client(conn, o.TLSConfig)
// We convert existing connection to TLS
if s.err = tlsConn.Handshake(); s.err != nil {
return tlsConn