Skip to content

Commit 858a42e

Browse files
sam-githubMylesBorins
authored andcommitted
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 b68d47a commit 858a42e

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

lib/_tls_wrap.js

+13-11
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,7 @@ exports.connect = function connect(...args) {
11261126

11271127
const context = options.secureContext || tls.createSecureContext(options);
11281128

1129-
var socket = new TLSSocket(options.socket, {
1129+
var tlssock = new TLSSocket(options.socket, {
11301130
pipe: !!options.path,
11311131
secureContext: context,
11321132
isServer: false,
@@ -1137,12 +1137,14 @@ exports.connect = function connect(...args) {
11371137
requestOCSP: options.requestOCSP
11381138
});
11391139

1140-
socket[kConnectOptions] = options;
1140+
tlssock[kConnectOptions] = options;
11411141

11421142
if (cb)
1143-
socket.once('secureConnect', cb);
1143+
tlssock.once('secureConnect', cb);
11441144

11451145
if (!options.socket) {
1146+
// If user provided the socket, its their responsibility to manage its
1147+
// connectivity. If we created one internally, we connect it.
11461148
const connectOpt = {
11471149
path: options.path,
11481150
port: options.port,
@@ -1152,22 +1154,22 @@ exports.connect = function connect(...args) {
11521154
localPort: options.localPort,
11531155
lookup: options.lookup
11541156
};
1155-
socket.connect(connectOpt, socket._start);
1157+
tlssock.connect(connectOpt, tlssock._start);
11561158
}
11571159

1158-
socket._releaseControl();
1160+
tlssock._releaseControl();
11591161

11601162
if (options.session)
1161-
socket.setSession(options.session);
1163+
tlssock.setSession(options.session);
11621164

11631165
if (options.servername)
1164-
socket.setServername(options.servername);
1166+
tlssock.setServername(options.servername);
11651167

11661168
if (options.socket)
1167-
socket._start();
1169+
tlssock._start();
11681170

1169-
socket.on('secure', onConnectSecure);
1170-
socket.once('end', onConnectEnd);
1171+
tlssock.on('secure', onConnectSecure);
1172+
tlssock.once('end', onConnectEnd);
11711173

1172-
return socket;
1174+
return tlssock;
11731175
};

0 commit comments

Comments
 (0)