tor-browser

commit 316da72f2f18ffa992d99662517ae6124edf9bf2
parent f72b853afcad63b7c8c644c9f9d2bc1c3509a656
Author: Randell Jesup <rjesup@mozilla.com>
Date:   Fri, 19 Dec 2025 17:12:45 +0000

Bug 2006847: Fix win10 for test_proxyDNSLeak.js r=necko-reviewers,valentin

Differential Revision: https://phabricator.services.mozilla.com/D277069

Diffstat:
M
netwerk/dns/nsHostResolver.cpp
 | 
10
++++++++--
M
netwerk/test/unit/xpcshell.toml
 | 
1
-

2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/netwerk/dns/nsHostResolver.cpp b/netwerk/dns/nsHostResolver.cpp
@@ -173,8 +173,7 @@ nsresult nsHostResolver::Init() MOZ_NO_THREAD_SAFETY_ANALYSIS {
   // For some reason, the DNSQuery_A API doesn't work on Windows 10.
   // It returns a success code, but no records. We only allow
   // native HTTPS records on Win 11 for now.
-  sNativeHTTPSSupported = StaticPrefs::network_dns_native_https_query_win10() ||
-                          mozilla::IsWin11OrLater();
+  sNativeHTTPSSupported = mozilla::IsWin11OrLater();
 #elif defined(MOZ_WIDGET_ANDROID)
   // android_res_nquery only got added in API level 29
   sNativeHTTPSSupported = jni::GetAPIVersion() >= 29;
@@ -430,6 +429,13 @@ bool nsHostResolver::IsNativeHTTPSEnabled() {
   if (!StaticPrefs::network_dns_native_https_query()) {
     return false;
   }
+#ifdef XP_WIN
+  if (StaticPrefs::network_dns_native_https_query_win10()) {
+    // If this pref is true, we allow resolving HTTPS records.
+    // It might not work, or we might use the HTTPS override records.
+    return true;
+  }
+#endif
   return sNativeHTTPSSupported;
 }
 
diff --git a/netwerk/test/unit/xpcshell.toml b/netwerk/test/unit/xpcshell.toml
@@ -1254,7 +1254,6 @@ skip-if = [
 skip-if = [
   "os == 'win' && os_version == '11.26100' && arch == 'x86' && socketprocess_networking",
   "os == 'win' && os_version == '11.26100' && arch == 'x86_64' && socketprocess_networking",
-  "os == 'win' && os_version == '10.2009' && arch == 'x86_64'", # Bug 2006847
 ]
 
 ["test_proxy_cancel.js"]