diff options
| author | Fedor Indutny <fedor@indutny.com> | 2017-05-04 19:05:35 -0400 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2017-05-15 17:25:44 -0400 |
| commit | e600fbe576e7806a01e11708b65830aeae96b590 (patch) | |
| tree | 83bdf1adbad8ce8c92d9e930fdb383dba6aadde2 /doc/api/tls.md | |
| parent | 276720921ba8b4428d3832867e8c6474156a75d1 (diff) | |
| download | android-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 'doc/api/tls.md')
| -rw-r--r-- | doc/api/tls.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/api/tls.md b/doc/api/tls.md index 9345e68bd2..88f93f51d1 100644 --- a/doc/api/tls.md +++ b/doc/api/tls.md @@ -753,6 +753,9 @@ decrease overall server throughput. added: v0.11.3 changes: - version: REPLACEME + pr-url: https://github.com/nodejs/node/pull/12839 + description: The `lookup` option is supported now. + - version: REPLACEME pr-url: https://github.com/nodejs/node/pull/11984 description: The `ALPNProtocols` and `NPNProtocols` options can be `Uint8Array`s now. @@ -809,6 +812,7 @@ changes: `tls.createSecureContext()`. *Note*: In effect, all [`tls.createSecureContext()`][] options can be provided, but they will be _completely ignored_ unless the `secureContext` option is missing. + * `lookup`: {Function} Custom lookup function. Defaults to [`dns.lookup()`][]. * ...: Optional [`tls.createSecureContext()`][] options can be provided, see the `secureContext` option for more information. * `callback` {Function} @@ -1291,3 +1295,4 @@ where `secure_socket` has the same API as `pair.cleartext`. [modifying the default cipher suite]: #tls_modifying_the_default_tls_cipher_suite [specific attacks affecting larger AES key sizes]: https://www.schneier.com/blog/archives/2009/07/another_new_aes.html [tls.Server]: #tls_class_tls_server +[`dns.lookup()`]: dns.html#dns_dns_lookup_hostname_options_callback |