bug 1446352 TRR: make "only mode" not wait for CP confirmation r?mcmanus draft
authorDaniel Stenberg <daniel@haxx.se>
Sat, 17 Mar 2018 19:56:12 +0100
changeset 768974 79bebb7eb203a5aee7e9cef4ba6a7032f87d4526
parent 768965 97160a734959af73cc97af0bf8d198e301ebedae
push id103017
push userbmo:daniel@haxx.se
push dateSat, 17 Mar 2018 19:24:51 +0000
reviewersmcmanus
bugs1446352
milestone61.0a1
bug 1446352 TRR: make "only mode" not wait for CP confirmation r?mcmanus ... to avoid a catch-22 as CP needs name resolve to work. MozReview-Commit-ID: DC1CjlUy4cJ
netwerk/dns/TRRService.cpp
--- a/netwerk/dns/TRRService.cpp
+++ b/netwerk/dns/TRRService.cpp
@@ -94,17 +94,17 @@ TRRService::Init()
   LOG(("Initialized TRRService\n"));
   return NS_OK;
 }
 
 bool
 TRRService::Enabled()
 {
   if (mConfirmationState == CONFIRM_INIT &&
-      (!mWaitForCaptive || mCaptiveIsPassed)) {
+      (!mWaitForCaptive || mCaptiveIsPassed || (mMode == MODE_TRRONLY))) {
     LOG(("TRRService::Enabled => CONFIRM_TRYING\n"));
     mConfirmationState = CONFIRM_TRYING;
   }
 
   if (mConfirmationState == CONFIRM_TRYING) {
     LOG(("TRRService::Enabled MaybeConfirm()\n"));
     MaybeConfirm();
   }