@@ -1227,7 +1227,7 @@ exports.connect = function connect(...args) {
1227
1227
1228
1228
const context = options . secureContext || tls . createSecureContext ( options ) ;
1229
1229
1230
- var socket = new TLSSocket ( options . socket , {
1230
+ var tlssock = new TLSSocket ( options . socket , {
1231
1231
pipe : ! ! options . path ,
1232
1232
secureContext : context ,
1233
1233
isServer : false ,
@@ -1238,12 +1238,14 @@ exports.connect = function connect(...args) {
1238
1238
requestOCSP : options . requestOCSP
1239
1239
} ) ;
1240
1240
1241
- socket [ kConnectOptions ] = options ;
1241
+ tlssock [ kConnectOptions ] = options ;
1242
1242
1243
1243
if ( cb )
1244
- socket . once ( 'secureConnect' , cb ) ;
1244
+ tlssock . once ( 'secureConnect' , cb ) ;
1245
1245
1246
1246
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.
1247
1249
const connectOpt = {
1248
1250
path : options . path ,
1249
1251
port : options . port ,
@@ -1252,13 +1254,13 @@ exports.connect = function connect(...args) {
1252
1254
localAddress : options . localAddress ,
1253
1255
lookup : options . lookup
1254
1256
} ;
1255
- socket . connect ( connectOpt , socket . _start ) ;
1257
+ tlssock . connect ( connectOpt , tlssock . _start ) ;
1256
1258
}
1257
1259
1258
- socket . _releaseControl ( ) ;
1260
+ tlssock . _releaseControl ( ) ;
1259
1261
1260
1262
if ( options . session )
1261
- socket . setSession ( options . session ) ;
1263
+ tlssock . setSession ( options . session ) ;
1262
1264
1263
1265
if ( options . servername ) {
1264
1266
if ( ! ipServernameWarned && net . isIP ( options . servername ) ) {
@@ -1270,14 +1272,14 @@ exports.connect = function connect(...args) {
1270
1272
) ;
1271
1273
ipServernameWarned = true ;
1272
1274
}
1273
- socket . setServername ( options . servername ) ;
1275
+ tlssock . setServername ( options . servername ) ;
1274
1276
}
1275
1277
1276
1278
if ( options . socket )
1277
- socket . _start ( ) ;
1279
+ tlssock . _start ( ) ;
1278
1280
1279
- socket . on ( 'secure' , onConnectSecure ) ;
1280
- socket . once ( 'end' , onConnectEnd ) ;
1281
+ tlssock . on ( 'secure' , onConnectSecure ) ;
1282
+ tlssock . once ( 'end' , onConnectEnd ) ;
1281
1283
1282
- return socket ;
1284
+ return tlssock ;
1283
1285
} ;
0 commit comments