Commit 453bd18
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 <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>1 parent e1d4f43 commit 453bd18
1 file changed
Lines changed: 13 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1224,7 +1224,7 @@ exports.connect = function connect(...args) { | |||
| 1224 | 1224 | ||
| 1225 | 1225 | const context = options.secureContext || tls.createSecureContext(options); | |
| 1226 | 1226 | ||
| 1227 | - var socket = new TLSSocket(options.socket, { | ||
| 1227 | + var tlssock = new TLSSocket(options.socket, { | ||
| 1228 | 1228 | pipe: !!options.path, | |
| 1229 | 1229 | secureContext: context, | |
| 1230 | 1230 | isServer: false, | |
@@ -1235,12 +1235,14 @@ exports.connect = function connect(...args) { | |||
| 1235 | 1235 | requestOCSP: options.requestOCSP | |
| 1236 | 1236 | }); | |
| 1237 | 1237 | ||
| 1238 | - socket[kConnectOptions] = options; | ||
| 1238 | + tlssock[kConnectOptions] = options; | ||
| 1239 | 1239 | ||
| 1240 | 1240 | if (cb) | |
| 1241 | - socket.once('secureConnect', cb); | ||
| 1241 | + tlssock.once('secureConnect', cb); | ||
| 1242 | 1242 | ||
| 1243 | 1243 | if (!options.socket) { | |
| 1244 | + // If user provided the socket, its their responsibility to manage its | ||
| 1245 | + // connectivity. If we created one internally, we connect it. | ||
| 1244 | 1246 | const connectOpt = { | |
| 1245 | 1247 | path: options.path, | |
| 1246 | 1248 | port: options.port, | |
@@ -1249,22 +1251,22 @@ exports.connect = function connect(...args) { | |||
| 1249 | 1251 | localAddress: options.localAddress, | |
| 1250 | 1252 | lookup: options.lookup | |
| 1251 | 1253 | }; | |
| 1252 | - socket.connect(connectOpt, socket._start); | ||
| 1254 | + tlssock.connect(connectOpt, tlssock._start); | ||
| 1253 | 1255 | } | |
| 1254 | 1256 | ||
| 1255 | - socket._releaseControl(); | ||
| 1257 | + tlssock._releaseControl(); | ||
| 1256 | 1258 | ||
| 1257 | 1259 | if (options.session) | |
| 1258 | - socket.setSession(options.session); | ||
| 1260 | + tlssock.setSession(options.session); | ||
| 1259 | 1261 | ||
| 1260 | 1262 | if (options.servername) | |
| 1261 | - socket.setServername(options.servername); | ||
| 1263 | + tlssock.setServername(options.servername); | ||
| 1262 | 1264 | ||
| 1263 | 1265 | if (options.socket) | |
| 1264 | - socket._start(); | ||
| 1266 | + tlssock._start(); | ||
| 1265 | 1267 | ||
| 1266 | - socket.on('secure', onConnectSecure); | ||
| 1267 | - socket.once('end', onConnectEnd); | ||
| 1268 | + tlssock.on('secure', onConnectSecure); | ||
| 1269 | + tlssock.once('end', onConnectEnd); | ||
| 1268 | 1270 | ||
| 1269 | - return socket; | ||
| 1271 | + return tlssock; | ||
| 1270 | 1272 | }; | |
0 commit comments