Bug 1637512 - IPv6 TRR requests don't fallback to DNS properly r=dragana,necko-reviewers
authorValentin Gosu <valentin.gosu@gmail.com>
Thu, 04 Jun 2020 11:12:19 +0000
changeset 597960 604346d2f6dade76d63d499532ce9a1c5d50d9cb
parent 597959 2cf1d4f4d8c6e0c421a692db893bf4d1c350ae98
child 597961 3b999337cd40c0e4d937bfe38e5e91d64790a77e
push id13310
push userffxbld-merge
push dateMon, 29 Jun 2020 14:50:06 +0000
treeherdermozilla-beta@15a59a0afa5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdragana, necko-reviewers
bugs1637512
milestone79.0a1
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
Bug 1637512 - IPv6 TRR requests don't fallback to DNS properly r=dragana,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D78237
netwerk/dns/nsHostResolver.cpp
--- a/netwerk/dns/nsHostResolver.cpp
+++ b/netwerk/dns/nsHostResolver.cpp
@@ -1554,17 +1554,17 @@ nsresult nsHostResolver::NameLookup(nsHo
       !((rec->flags & RES_DISABLE_TRR))) {
     rv = TrrLookup(rec);
   }
 
   bool serviceNotReady = !gTRRService || !gTRRService->IsConfirmed();
 
   if (rec->mEffectiveTRRMode == nsIRequest::TRR_DISABLED_MODE ||
       (rec->mEffectiveTRRMode == nsIRequest::TRR_FIRST_MODE &&
-       (rec->flags & RES_DISABLE_TRR || serviceNotReady) && NS_FAILED(rv))) {
+       (rec->flags & RES_DISABLE_TRR || serviceNotReady || NS_FAILED(rv)))) {
     if (!rec->IsAddrRecord()) {
       return rv;
     }
     rv = NativeLookup(rec);
   }
 
   return rv;
 }