[tbb-commits] [tor-browser] 01/03: Revert "Bug 41125: stop proxy bypass in ServiceRequest.fetch by gating with checking MOZ_PROXY_BYPASS_PROTECTION and network.proxy.allow_bypass"

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2
in repository tor-browser.

commit 725d7fdaf48477196a42ebf77e933497b0e4ec76
Author: Dan Ballard <dan at mindstab.net>
AuthorDate: Mon Oct 17 21:01:41 2022 -0700

    Revert "Bug 41125: stop proxy bypass in ServiceRequest.fetch by gating with checking MOZ_PROXY_BYPASS_PROTECTION and network.proxy.allow_bypass"
    
    This reverts commit 4be4528b0945f6dedfa4a2c7c5b5d2b3b54e88f9.
---
 services/settings/Utils.jsm      | 3 ---
 toolkit/modules/AppConstants.jsm | 7 -------
 2 files changed, 10 deletions(-)

diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
index bab0e078ea14..31ad77d28678 100644
--- a/services/settings/Utils.jsm
+++ b/services/settings/Utils.jsm
@@ -220,9 +220,6 @@ var Utils = {
       function fallbackOrReject(err) {
         if (
           // At most one recursive Utils.fetch call (bypassProxy=false to true).
-          // if allowed by network.proxy.allow_bypass
-          AppConstants.MOZ_PROXY_BYPASS_PROTECTION ||
-          !Services.prefs.getBoolPref("network.proxy.allow_bypass", false) ||
           bypassProxy ||
           Services.startup.shuttingDown ||
           Utils.isOffline ||
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index c74fd5b3dc2b..64695e4c996d 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -475,13 +475,6 @@ this.AppConstants = Object.freeze({
     false,
 #endif
 
-  MOZ_PROXY_BYPASS_PROTECTION:
-#ifdef MOZ_PROXY_BYPASS_PROTECTION
-    true,
-#else
-    false,
-#endif
-
   TOR_BROWSER_UPDATE:
 #ifdef TOR_BROWSER_UPDATE
     true,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.