Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
提交
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions lib/internal/tls/wrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -1898,6 +1898,12 @@ exports.connect = function connect(...args) {
if (cb)
tlssock.once('secureConnect', cb);

if (options.session)
tlssock.setSession(options.session);

if (options.servername)
tlssock.setServername(options.servername);

if (!options.socket) {
// If user provided the socket, it's their responsibility to manage its
// connectivity. If we created one internally, we connect it.
Expand All @@ -1910,13 +1916,6 @@ exports.connect = function connect(...args) {

tlssock._releaseControl();

if (options.session)
tlssock.setSession(options.session);

if (options.servername) {
tlssock.setServername(options.servername);
}

if (options.socket)
tlssock._start();

Expand Down
22 changes: 22 additions & 0 deletions test/parallel/test-tls-connect-sync-lookup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
'use strict';

const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const tls = require('node:tls');

// Verify that a synchronous lookup cannot interrupt TLS socket initialization.
const controller = new AbortController();
const socket = tls.connect({
host: 'example.com',
servername: 'example.com',
port: 443,
signal: controller.signal,
lookup(_hostname, _options, callback) {
callback(null, [{ address: '2001:db8::1', family: 6 }]);
controller.abort();
},
});

socket.on('error', common.mustCall());
Loading