summaryrefslogtreecommitdiff
path: root/lib/_tls_wrap.js
diff options
context:
space:
mode:
authorFedor Indutny <fedor@indutny.com>2017-05-04 19:05:35 -0400
committerFedor Indutny <fedor@indutny.com>2017-05-15 17:25:44 -0400
commite600fbe576e7806a01e11708b65830aeae96b590 (patch)
tree83bdf1adbad8ce8c92d9e930fdb383dba6aadde2 /lib/_tls_wrap.js
parent276720921ba8b4428d3832867e8c6474156a75d1 (diff)
downloadandroid-node-v8-e600fbe576e7806a01e11708b65830aeae96b590.tar.gz
android-node-v8-e600fbe576e7806a01e11708b65830aeae96b590.tar.bz2
android-node-v8-e600fbe576e7806a01e11708b65830aeae96b590.zip
tls: accept `lookup` option for `tls.connect()`
`net.connect()` and consequently `http.Agent` support custom DNS `lookup` option. However, as we move to `https.Agent` - this option no longer works because it is not proxied by `tls.connect`. Fix this inconsistency by passing it down to `net.connect`. PR-URL: https://github.com/nodejs/node/pull/12839 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'lib/_tls_wrap.js')
-rw-r--r--lib/_tls_wrap.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index b8a962e734..23a5c2840e 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -1063,7 +1063,8 @@ exports.connect = function(...args /* [port,] [host,] [options,] [cb] */) {
port: options.port,
host: options.host,
family: options.family,
- localAddress: options.localAddress
+ localAddress: options.localAddress,
+ lookup: options.lookup
};
}
socket.connect(connect_opt, function() {