[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.

[gk at torproject.org]

commit 36724cc11e94d0dc3094c94f046d76fb5ce44a2b
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Tue Jul 31 07:04:43 2018 -0700

    squash! TB4: Tor Browser's Firefox preference overrides.
    
    Bug 14952: Enable http/2 and AltSvc
    
    In Firefox, SPDY/HTTP2 now uses Origin Attributes for
    isolation of connections, push streams, origin frames, etc.
    That means we get first-party isolation provided
    "privacy.firstparty.isolate" is true. So in this patch, we
    stop overriding "network.http.spdy.enabled" and
    "network.http.spdy.enabled.http2".
    
    Alternate Services also use Origin Attributes for isolation.
    So we stop overriding
    "network.http.altsvc.enabled" and "network.http.altsvc.oe"
    as well.
    
    (All 4 of the abovementioned "network.http.*" prefs adopt
    Firefox 60ESR's default value of true.)
    
    However, we want to disable HTTP/2 push for now, so we
    set "network.http.spdy.allow-push" to false.
    
    "network.http.spdy.enabled.http2draft" was removed in Bug 1132357.
    "network.http.sped.enabled.v2" was removed in Bug 912550.
    "network.http.sped.enabled.v3" was removed in Bug 1097944.
    "network.http.sped.enabled.v3-1" was removed in Bug 1248197.
---
 browser/app/profile/000-tor-browser.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index d0fdbe1040b4..e87b38dcb775 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -174,15 +174,8 @@ pref("browser.cache.frecency_experiment", -1);
 // Third party stuff
 pref("privacy.firstparty.isolate", true); // Always enforce first party isolation
 pref("network.cookie.cookieBehavior", 1);
-pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable)
-pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case
-pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case
-pref("network.http.spdy.enabled.v3-1", false); // Seems redundant, but just in case
-pref("network.http.spdy.enabled.http2", false); // Temporarily disabled pending implementation review
-pref("network.http.spdy.enabled.http2draft", false); // Temporarily disabled pending implementation review
+pref("network.http.spdy.allow-push", false); // Disabled for now. See https://bugs.torproject.org/27127
 pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633
-pref("network.http.altsvc.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16673
-pref("network.http.altsvc.oe", false); // Temporarily disabled. See https://bugs.torproject.org/16673
 
 // Proxy and proxy security
 pref("network.proxy.socks", "127.0.0.1");