From 59203c63bb777a3bacec32fb8830fba33540e809 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:35:29 +0200
Subject: Adding upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 netwerk/base/nsProtocolProxyService.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'netwerk/base/nsProtocolProxyService.cpp')

diff --git a/netwerk/base/nsProtocolProxyService.cpp b/netwerk/base/nsProtocolProxyService.cpp
index 7ccfc9363a..743c977c74 100644
--- a/netwerk/base/nsProtocolProxyService.cpp
+++ b/netwerk/base/nsProtocolProxyService.cpp
@@ -2292,6 +2292,10 @@ void nsProtocolProxyService::MaybeDisableDNSPrefetch(nsIProxyInfo* aProxy) {
   nsCOMPtr<nsProxyInfo> pi = do_QueryInterface(aProxy);
   if (!pi || !pi->mType || pi->mType == kProxyType_DIRECT) return;
 
+  if (StaticPrefs::network_dns_prefetch_via_proxy()) {
+    return;
+  }
+
   // To avoid getting DNS service recursively, we directly use
   // GetXPCOMSingleton().
   nsCOMPtr<nsIDNSService> dns = nsDNSService::GetXPCOMSingleton();
-- 
cgit v1.2.3