From 7ad4989e12173bca56dd652ee0ce5ccca1434de9 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 29 Jan 2020 13:12:15 +0100
Subject: [PATCH 1/2] dns: default to verbatim=true in dns.lookup()

Switch the default from false (reorder the result so that IPv4 addresses
come before IPv6 addresses) to true (return them exactly as the resolver
sent them to us.)

Fixes: https://github.com/nodejs/node/issues/31566
Refs: https://github.com/nodejs/node/issues/6307
Refs: https://github.com/nodejs/node/pull/20710
---
 doc/api/dns.md               | 7 ++++---
 lib/dns.js                   | 4 ++--
 lib/internal/dns/promises.js | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/api/dns.md b/doc/api/dns.md
index 6c7f29cfaf0f85..c1ebb11a7d8565 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -124,6 +124,9 @@ section if a custom port is used.
 <!-- YAML
 added: v0.1.90
 changes:
+  - version: REPLACEME
+    pr-url: REPLACEME
+    description: The `verbatim` options defaults to `true` now.
   - version: v8.5.0
     pr-url: https://github.com/nodejs/node/pull/14731
     description: The `verbatim` option is supported now.
@@ -144,9 +147,7 @@ changes:
   * `verbatim` {boolean} When `true`, the callback receives IPv4 and IPv6
     addresses in the order the DNS resolver returned them. When `false`,
     IPv4 addresses are placed before IPv6 addresses.
-    **Default:** currently `false` (addresses are reordered) but this is
-    expected to change in the not too distant future.
-    New code should use `{ verbatim: true }`.
+    **Default:** `true`.
 * `callback` {Function}
   * `err` {Error}
   * `address` {string} A string representation of an IPv4 or IPv6 address.
diff --git a/lib/dns.js b/lib/dns.js
index 8a6c7456babbd0..cc91c9414522c8 100644
--- a/lib/dns.js
+++ b/lib/dns.js
@@ -95,7 +95,7 @@ function lookup(hostname, options, callback) {
   let hints = 0;
   let family = -1;
   let all = false;
-  let verbatim = false;
+  let verbatim = true;
 
   // Parse arguments
   if (hostname && typeof hostname !== 'string') {
@@ -109,7 +109,7 @@ function lookup(hostname, options, callback) {
     hints = options.hints >>> 0;
     family = options.family >>> 0;
     all = options.all === true;
-    verbatim = options.verbatim === true;
+    verbatim = options.verbatim !== false;
 
     validateHints(hints);
   } else {
diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js
index ae007fd31934e2..fb63ec374ca9b7 100644
--- a/lib/internal/dns/promises.js
+++ b/lib/internal/dns/promises.js
@@ -106,7 +106,7 @@ function lookup(hostname, options) {
   var hints = 0;
   var family = -1;
   var all = false;
-  var verbatim = false;
+  var verbatim = true;
 
   // Parse arguments
   if (hostname && typeof hostname !== 'string') {
@@ -115,7 +115,7 @@ function lookup(hostname, options) {
     hints = options.hints >>> 0;
     family = options.family >>> 0;
     all = options.all === true;
-    verbatim = options.verbatim === true;
+    verbatim = options.verbatim !== false;
 
     validateHints(hints);
   } else {

From 7d812004cf67d602c955bb1151d9938bc1119a9e Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 29 Jan 2020 13:17:21 +0100
Subject: [PATCH 2/2] fixup! update pr-url

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

diff --git a/doc/api/dns.md b/doc/api/dns.md
index c1ebb11a7d8565..43047eacb3753d 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -125,7 +125,7 @@ section if a custom port is used.
 added: v0.1.90
 changes:
   - version: REPLACEME
-    pr-url: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/31567
     description: The `verbatim` options defaults to `true` now.
   - version: v8.5.0
     pr-url: https://github.com/nodejs/node/pull/14731