[tor-commits] [tor-browser] 01/02: Bug 40913: Disable Firefox's proxy bypass flag

[gitolite role]

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

richard pushed a commit to branch geckoview-96.0.3-11.0-1
in repository tor-browser.

commit a8722ba4016deed46d431630aa5ad6cc995f7c35
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Mon May 9 12:13:10 2022 +0200

    Bug 40913: Disable Firefox's proxy bypass flag
    
    Mozilla introduced a flag to bypass proxies in HTTP requests in
    https://bugzilla.mozilla.org/show_bug.cgi?id=1732388.
    It is intended to be used for updates, but in Tor Browser we want them
    to go through Tor, and we do not want any requests to bypass the proxy.
---
 netwerk/protocol/http/HttpBaseChannel.cpp | 8 ++------
 netwerk/protocol/http/nsHttpChannel.cpp   | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index bda1ca2482532..0bc83761086ae 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -3314,16 +3314,12 @@ HttpBaseChannel::SetBeConservative(bool aBeConservative) {
 
 NS_IMETHODIMP
 HttpBaseChannel::GetBypassProxy(bool* aBypassProxy) {
-  NS_ENSURE_ARG_POINTER(aBypassProxy);
-
-  *aBypassProxy = LoadBypassProxy();
-  return NS_OK;
+  return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 HttpBaseChannel::SetBypassProxy(bool aBypassProxy) {
-  StoreBypassProxy(aBypassProxy);
-  return NS_OK;
+  return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 6b03bef496fbc..dedc2656437a9 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -5934,7 +5934,7 @@ void nsHttpChannel::MaybeResolveProxyAndBeginConnect() {
   // settings if we are never going to make a network connection.
   if (!mProxyInfo &&
       !(mLoadFlags & (LOAD_ONLY_FROM_CACHE | LOAD_NO_NETWORK_IO)) &&
-      !LoadBypassProxy() && NS_SUCCEEDED(ResolveProxy())) {
+      NS_SUCCEEDED(ResolveProxy())) {
     return;
   }
 

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