summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-01-14 15:07:15 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-01-14 15:07:15 +0100
commit1392abe1def56308c0cee4ab834c3968040272b9 (patch)
tree2ad4d13caa7ddb0d3762521d247445fe0696ad81
parentabf6fd8f2a6a9ba24e641f9965bc5bbb36477c85 (diff)
downloadUXP-1392abe1def56308c0cee4ab834c3968040272b9.tar
UXP-1392abe1def56308c0cee4ab834c3968040272b9.tar.gz
UXP-1392abe1def56308c0cee4ab834c3968040272b9.tar.lz
UXP-1392abe1def56308c0cee4ab834c3968040272b9.tar.xz
UXP-1392abe1def56308c0cee4ab834c3968040272b9.zip
No issue - Remove unused network.http.bypass-cachelock-threshold pref.
-rw-r--r--modules/libpref/init/all.js8
-rw-r--r--testing/marionette/client/marionette_driver/geckoinstance.py2
-rw-r--r--testing/profiles/prefs_general.js3
3 files changed, 0 insertions, 13 deletions
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index e1da0386d..64522fcaf 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1572,14 +1572,6 @@ pref("network.http.rendering-critical-requests-prioritization", true);
// IPv6 connectivity.
pref("network.http.fast-fallback-to-IPv4", true);
-// The maximum amount of time the cache session lock can be held
-// before a new transaction bypasses the cache. In milliseconds.
-#ifdef RELEASE_OR_BETA
-pref("network.http.bypass-cachelock-threshold", 200000);
-#else
-pref("network.http.bypass-cachelock-threshold", 250);
-#endif
-
// Try and use SPDY when using SSL
pref("network.http.spdy.enabled", true);
pref("network.http.spdy.enabled.http2", true);
diff --git a/testing/marionette/client/marionette_driver/geckoinstance.py b/testing/marionette/client/marionette_driver/geckoinstance.py
index 174168ed2..c59cc2ace 100644
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -77,8 +77,6 @@ class GeckoInstance(object):
"marionette.defaultPrefs.enabled": True,
"media.volume_scale": "0.01",
- # Make sure the disk cache doesn't get auto disabled
- "network.http.bypass-cachelock-threshold": 200000,
# Do not prompt for temporary redirects
"network.http.prompt-temp-redirect": False,
# Disable speculative connections so they aren"t reported as leaking when they"re
diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js
index 3ec41b385..960cbda15 100644
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -197,9 +197,6 @@ user_pref("dom.mozContacts.enabled", true);
// Enable mozSettings
user_pref("dom.mozSettings.enabled", true);
-// Make sure the disk cache doesn't get auto disabled
-user_pref("network.http.bypass-cachelock-threshold", 200000);
-
// Enable Gamepad
user_pref("dom.gamepad.enabled", true);
user_pref("dom.gamepad.non_standard_events.enabled", true);