Backed out changeset 0192efea1b66 (bug 1486137) for failing at netwerk/test/unit/test_trr.js on a CLOSED TREE
authorGurzau Raul <rgurzau@mozilla.com>
Tue, 28 Aug 2018 16:29:25 +0300
changeset 491295 a360d3279b9f2ac82a7e81f3878a6eff63a466e8
parent 491294 edb57a49546ffb8911e718059e991342d3fd74be
child 491296 6f6eab842feaf00a38653dd4405aca1ec4d075db
push id1815
push userffxbld-merge
push dateMon, 15 Oct 2018 10:40:45 +0000
treeherdermozilla-release@18d4c09e9378 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1486137
milestone63.0a1
backs out0192efea1b664db8d20a691401ec5d3f9d3a2122
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 0192efea1b66 (bug 1486137) for failing at netwerk/test/unit/test_trr.js on a CLOSED TREE
netwerk/dns/TRR.cpp
--- a/netwerk/dns/TRR.cpp
+++ b/netwerk/dns/TRR.cpp
@@ -134,19 +134,18 @@ TRR::DohEncode(nsCString &aBody, bool aD
     // The RDATA is just the ECS option setting zero subnet prefix
 
     aBody += '\0'; // upper 8 bit OPTION-CODE ECS
     aBody += 8;    // OPTION-CODE, 2 octets, for ECS is 8
 
     aBody += '\0'; // upper 8 bit OPTION-LENGTH
     aBody += 4;    // OPTION-LENGTH, 2 octets, contains the length of the payload
                    // after OPTION-LENGTH
-    aBody += '\0'; // upper 8 bit FAMILY. IANA Address Family Numbers registry, not the
-                   // AF_* constants!
-    aBody += 1;    // FAMILY (Ipv4), 2 octets
+    aBody += '\0'; // upper 8 bit FAMILY
+    aBody += AF_INET; // FAMILY, 2 octets
 
     aBody += '\0'; // SOURCE PREFIX-LENGTH      |     SCOPE PREFIX-LENGTH       |
     aBody += '\0';
 
     // ADDRESS, minimum number of octets == nothing because zero bits
   }
   return NS_OK;
 }