From 1a676b5dcd9c6312d08095c9e3361505461bb3f4 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Thu, 4 May 2017 19:05:35 -0400
Subject: [PATCH 1/4] 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`.
---
 doc/api/tls.md                   |  1 +
 lib/_tls_wrap.js                 |  3 ++-
 test/parallel/test-tls-lookup.js | 34 ++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 test/parallel/test-tls-lookup.js

diff --git a/doc/api/tls.md b/doc/api/tls.md
index a11631b0134520..a383ad7f95e12d 100644
--- a/doc/api/tls.md
+++ b/doc/api/tls.md
@@ -809,6 +809,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}
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index 511ff3557a6e23..1a827b37171007 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -1066,7 +1066,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() {
diff --git a/test/parallel/test-tls-lookup.js b/test/parallel/test-tls-lookup.js
new file mode 100644
index 00000000000000..571ed556a6816f
--- /dev/null
+++ b/test/parallel/test-tls-lookup.js
@@ -0,0 +1,34 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const tls = require('tls');
+
+const expectedError = /^TypeError: "lookup" option should be a function$/;
+
+['foobar', 1, {}, []].forEach((input) => connectThrows(input));
+
+function connectThrows(input) {
+  const opts = {
+    host: 'localhost',
+    port: common.PORT,
+    lookup: input
+  };
+
+  assert.throws(function() {
+    tls.connect(opts);
+  }, expectedError);
+}
+
+connectDoesNotThrow(common.mustCall(common.noop));
+
+function connectDoesNotThrow(input) {
+  const opts = {
+    host: 'localhost',
+    port: common.PORT,
+    lookup: input
+  };
+
+  assert.doesNotThrow(function() {
+    tls.connect(opts);
+  });
+}

From cfdb7ef72c82853e6e76d1825aa22496f1d56826 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Sat, 6 May 2017 15:17:05 -0400
Subject: [PATCH 2/4] fix

---
 doc/api/tls.md                   | 3 +++
 test/parallel/test-tls-lookup.js | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/api/tls.md b/doc/api/tls.md
index a383ad7f95e12d..4a6ffed7a13e25 100644
--- a/doc/api/tls.md
+++ b/doc/api/tls.md
@@ -752,6 +752,9 @@ decrease overall server throughput.
 <!-- YAML
 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
diff --git a/test/parallel/test-tls-lookup.js b/test/parallel/test-tls-lookup.js
index 571ed556a6816f..698f0680767539 100644
--- a/test/parallel/test-tls-lookup.js
+++ b/test/parallel/test-tls-lookup.js
@@ -5,9 +5,7 @@ const tls = require('tls');
 
 const expectedError = /^TypeError: "lookup" option should be a function$/;
 
-['foobar', 1, {}, []].forEach((input) => connectThrows(input));
-
-function connectThrows(input) {
+['foobar', 1, {}, []].forEach(function connectThrows(input) {
   const opts = {
     host: 'localhost',
     port: common.PORT,
@@ -17,9 +15,9 @@ function connectThrows(input) {
   assert.throws(function() {
     tls.connect(opts);
   }, expectedError);
-}
+});
 
-connectDoesNotThrow(common.mustCall(common.noop));
+connectDoesNotThrow(common.mustCall(() => {}));
 
 function connectDoesNotThrow(input) {
   const opts = {

From 2f78830a0b9f9ad7b72d25166aad1fa4ec7739fd Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Tue, 9 May 2017 16:33:05 -0400
Subject: [PATCH 3/4] fix

---
 doc/api/tls.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/api/tls.md b/doc/api/tls.md
index 4a6ffed7a13e25..341b85d5cacfa7 100644
--- a/doc/api/tls.md
+++ b/doc/api/tls.md
@@ -1295,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

From a95f6ea4ee406531e543bc6a0c57ca283b21b7ec Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Mon, 15 May 2017 15:41:28 -0400
Subject: [PATCH 4/4] fix

---
 doc/api/tls.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/tls.md b/doc/api/tls.md
index 341b85d5cacfa7..29b330b8c0d08f 100644
--- a/doc/api/tls.md
+++ b/doc/api/tls.md
@@ -1295,4 +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
+[`dns.lookup()`]: dns.html#dns_dns_lookup_hostname_options_callback