Bug 1059202 - Followup to revert unwanted changes in all.js r=me a=bajaj
authorFabrice Desré <fabrice@mozilla.com>
Sat, 20 Sep 2014 13:47:52 -0700
changeset 225002 b96413e1b92176b6085141c068c90ce102c49c63
parent 225001 be73288ec122bbea10d24a1a18bed597097ce35e
child 225003 c61d4add4ba562a96c1563535d0fab051d62459a
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, bajaj
bugs1059202
milestone34.0a2
Bug 1059202 - Followup to revert unwanted changes in all.js r=me a=bajaj
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1718,17 +1718,17 @@ pref("security.csp.experimentalEnabled",
 // Default Content Security Policy to apply to privileged apps.
 pref("security.apps.privileged.CSP.default", "default-src *; script-src 'self'; object-src 'none'; style-src 'self' 'unsafe-inline'");
 
 // Mixed content blocking
 pref("security.mixed_content.block_active_content", false);
 pref("security.mixed_content.block_display_content", false);
 
 // Disable pinning checks by default.
-pref("security.cert_pinning.enforcement_level", 2);
+pref("security.cert_pinning.enforcement_level", 0);
 
 // Modifier key prefs: default to Windows settings,
 // menu access key = alt, accelerator key = control.
 // Use 17 for Ctrl, 18 for Alt, 224 for Meta, 91 for Win, 0 for none. Mac settings in macprefs.js
 pref("ui.key.accelKey", 17);
 pref("ui.key.menuAccessKey", 18);
 pref("ui.key.generalAccessKey", -1);
 
@@ -4072,17 +4072,17 @@ pref("dom.mozApps.maxLocalId", 1000);
 // builds it may contain more than one origin so we can test
 // different stages (dev, staging, prod) of the same app store.
 pref("dom.mozApps.signed_apps_installable_from", "https://marketplace.firefox.com");
 
 // Whether or not to dump mozApps debug messages to the console.
 // Only checked on startup, so restart after changing this pref.
 // Ignored on Android, where we always report debug messages because it's
 // unnecessary to restrict reporting, per bug 1003469.
-pref("dom.mozApps.debug", true);
+pref("dom.mozApps.debug", false);
 
 // Minimum delay in milliseconds between network activity notifications (0 means
 // no notifications). The delay is the same for both download and upload, though
 // they are handled separately. This pref is only read once at startup:
 // a restart is required to enable a new value.
 pref("network.activity.blipIntervalMilliseconds", 0);
 
 // If true, reuse the same global for everything loaded by the component loader