Bug 1440709 - Disabling mixed content upgrading for now. r?ckerschb draft
authorJonathan Kingston <jkt@mozilla.com>
Tue, 27 Feb 2018 18:31:55 +0000
changeset 760486 659cd117088ed570703ceb244ed9941b8e92047d
parent 760485 4cee3292108911b04c10965f8f27ee52b6c1c366
push id100662
push userbmo:jkt@mozilla.com
push dateTue, 27 Feb 2018 18:36:10 +0000
reviewersckerschb
bugs1440709
milestone60.0a1
Bug 1440709 - Disabling mixed content upgrading for now. r?ckerschb MozReview-Commit-ID: AMaEstZlrI1
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2633,21 +2633,17 @@ pref("security.csp.enable_violation_even
 // Default Content Security Policy to apply to signed contents.
 pref("security.signed_content.CSP.default", "script-src 'self'; style-src 'self'");
 
 // Mixed content blocking
 pref("security.mixed_content.block_active_content", false);
 pref("security.mixed_content.block_display_content", false);
 
 // Upgrade mixed display content before it's blocked
-#ifdef NIGHTLY_BUILD
-pref("security.mixed_content.upgrade_display_content", true);
-#else
 pref("security.mixed_content.upgrade_display_content", false);
-#endif
 
 // Block sub requests that happen within an object
 #ifdef EARLY_BETA_OR_EARLIER
 pref("security.mixed_content.block_object_subrequest", true);
 #else
 pref("security.mixed_content.block_object_subrequest", false);
 #endif