diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js index 5c943f2cd6c..1fc339cc2e8 100644 --- a/lib/_tls_wrap.js +++ b/lib/_tls_wrap.js @@ -1227,7 +1227,7 @@ exports.connect = function connect(...args) { const context = options.secureContext || tls.createSecureContext(options); - var socket = new TLSSocket(options.socket, { + var tlssock = new TLSSocket(options.socket, { pipe: !!options.path, secureContext: context, isServer: false, @@ -1238,12 +1238,14 @@ exports.connect = function connect(...args) { requestOCSP: options.requestOCSP }); - socket[kConnectOptions] = options; + tlssock[kConnectOptions] = options; if (cb) - socket.once('secureConnect', cb); + tlssock.once('secureConnect', cb); if (!options.socket) { + // If user provided the socket, its their responsibility to manage its + // connectivity. If we created one internally, we connect it. const connectOpt = { path: options.path, port: options.port, @@ -1252,13 +1254,13 @@ exports.connect = function connect(...args) { localAddress: options.localAddress, lookup: options.lookup }; - socket.connect(connectOpt, socket._start); + tlssock.connect(connectOpt, tlssock._start); } - socket._releaseControl(); + tlssock._releaseControl(); if (options.session) - socket.setSession(options.session); + tlssock.setSession(options.session); if (options.servername) { if (!ipServernameWarned && net.isIP(options.servername)) { @@ -1270,14 +1272,14 @@ exports.connect = function connect(...args) { ); ipServernameWarned = true; } - socket.setServername(options.servername); + tlssock.setServername(options.servername); } if (options.socket) - socket._start(); + tlssock._start(); - socket.on('secure', onConnectSecure); - socket.once('end', onConnectEnd); + tlssock.on('secure', onConnectSecure); + tlssock.once('end', onConnectEnd); - return socket; + return tlssock; };