1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tls: do not confuse TLSSocket and Socket

Browse Source 
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>
This commit is contained in:
Sam Roberts 2018-12-19 14:42:58 -08:00
parent 59aa94112e
commit b50c22a904
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/_tls_wrap.js
View File

@ -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;
};