Skip to content

Commit b50c22a

Browse files
committed
tls: do not confuse TLSSocket and Socket
Don't use "socket" to describe two different objects in the same function. PR-URL: #25153 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anatoli Papirovski <[email protected]>
1 parent 59aa941 commit b50c22a

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

lib/_tls_wrap.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ exports.connect = function connect(...args) {
12271227

12281228
const context = options.secureContext || tls.createSecureContext(options);
12291229

1230-
var socket = new TLSSocket(options.socket, {
1230+
var tlssock = new TLSSocket(options.socket, {
12311231
pipe: !!options.path,
12321232
secureContext: context,
12331233
isServer: false,
@@ -1238,12 +1238,14 @@ exports.connect = function connect(...args) {
12381238
requestOCSP: options.requestOCSP
12391239
});
12401240

1241-
socket[kConnectOptions] = options;
1241+
tlssock[kConnectOptions] = options;
12421242

12431243
if (cb)
1244-
socket.once('secureConnect', cb);
1244+
tlssock.once('secureConnect', cb);
12451245

12461246
if (!options.socket) {
1247+
// If user provided the socket, its their responsibility to manage its
1248+
// connectivity. If we created one internally, we connect it.
12471249
const connectOpt = {
12481250
path: options.path,
12491251
port: options.port,
@@ -1252,13 +1254,13 @@ exports.connect = function connect(...args) {
12521254
localAddress: options.localAddress,
12531255
lookup: options.lookup
12541256
};
1255-
socket.connect(connectOpt, socket._start);
1257+
tlssock.connect(connectOpt, tlssock._start);
12561258
}
12571259

1258-
socket._releaseControl();
1260+
tlssock._releaseControl();
12591261

12601262
if (options.session)
1261-
socket.setSession(options.session);
1263+
tlssock.setSession(options.session);
12621264

12631265
if (options.servername) {
12641266
if (!ipServernameWarned && net.isIP(options.servername)) {
@@ -1270,14 +1272,14 @@ exports.connect = function connect(...args) {
12701272
);
12711273
ipServernameWarned = true;
12721274
}
1273-
socket.setServername(options.servername);
1275+
tlssock.setServername(options.servername);
12741276
}
12751277

12761278
if (options.socket)
1277-
socket._start();
1279+
tlssock._start();
12781280

1279-
socket.on('secure', onConnectSecure);
1280-
socket.once('end', onConnectEnd);
1281+
tlssock.on('secure', onConnectSecure);
1282+
tlssock.once('end', onConnectEnd);
12811283

1282-
return socket;
1284+
return tlssock;
12831285
};

0 commit comments

Comments
 (0)