summaryrefslogtreecommitdiff
path: root/vendor.js
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2019-04-18 20:30:35 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2019-04-18 20:30:35 -0700
commit83878813a41cdb42e8a114cc265df4b947a18e6b (patch)
treea817043d6735931a2bc4ce3dd5771f7e17abb8b2 /vendor.js
parentMore vendor.js updates (diff)
downloadfirefox-esr-83878813a41cdb42e8a114cc265df4b947a18e6b.tar.xz
Re-enabled blacklist updates
Removed obsolete noscript settings
Diffstat (limited to 'vendor.js')
-rw-r--r--vendor.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/vendor.js b/vendor.js
index 9c4883a..4f4d1a9 100644
--- a/vendor.js
+++ b/vendor.js
@@ -339,7 +339,8 @@ pref("dom.webnotifications.serviceworker.enabled", false); //Conflict
//pref("extensions.autoDisableScopes", 0); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox
pref("extensions.autoDisableScopes", 15); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox //Conflict
pref("extensions.blocklist.detailsURL", "https://blocked.cdn.mozilla.net/");
-pref("extensions.blocklist.enabled", false);
+pref("extensions.blocklist.enabled", true);
+//pref("extensions.blocklist.enabled", false); //Conflict
pref("extensions.blocklist.itemURL", "https://blocked.cdn.mozilla.net/%blockID%.html");
//pref("extensions.blocklist.url", "https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
pref("extensions.blocklist.url", "https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%APP_ID%/%APP_VERSION%/"); //Conflict
@@ -590,11 +591,6 @@ pref("network.trr.uri", "");
//pref("network.trr.waitforportal", true);
pref("network.trr.waitforportal", false); //Conflict
-pref("noscript.ABE.wanIpAsLocal", false);
-pref("noscript.allowWhitelistUpdates", false);
-pref("noscript.forbidFonts", true);
-pref("noscript.forbidMedia", true);
-
pref("nsITelemetry.canRecordBase", false);
pref("nsITelemetry.canRecordExtended", false);