diff options
author | Sam Roberts <vieuxtech@gmail.com> | 2018-12-19 14:42:58 -0800 |
---|---|---|
committer | Sam Roberts <vieuxtech@gmail.com> | 2018-12-28 12:57:35 -0800 |
commit | b50c22a904e669551f818bab0472c70d6d3b25c5 (patch) | |
tree | 6bf984e767059ca2e2a37c60670c0d539bb16353 /lib | |
parent | 59aa94112eb88176b60430e8e65436b7a55b270d (diff) | |
download | android-node-v8-b50c22a904e669551f818bab0472c70d6d3b25c5.tar.gz android-node-v8-b50c22a904e669551f818bab0472c70d6d3b25c5.tar.bz2 android-node-v8-b50c22a904e669551f818bab0472c70d6d3b25c5.zip |
tls: do not confuse TLSSocket and Socket
Don't use "socket" to describe two different objects in the same
function.
PR-URL: https://github.com/nodejs/node/pull/25153
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/_tls_wrap.js | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js index 5c943f2cd6..1fc339cc2e 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; }; |