Bug 1374453 - turn HSTS priming on in Beta r?ckerschb draft
authorKate McKinley <kmckinley@mozilla.com>
Mon, 19 Jun 2017 14:46:48 -0700
changeset 597745 a36d2fe0e8dde44e1a79e1c17a0e4babc68bf10c
parent 597691 0152176a1d399a54db582a83b828f6b8ba90a10a
child 634305 c0044ce25cee945430814dd8ca2573d0cde25efc
push id65013
push userbmo:kmckinley@mozilla.com
push dateTue, 20 Jun 2017 22:18:46 +0000
reviewersckerschb
bugs1374453
milestone56.0a1
Bug 1374453 - turn HSTS priming on in Beta r?ckerschb MozReview-Commit-ID: JHc47g8cDmb
modules/libpref/init/all.js
security/manager/ssl/security-prefs.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5636,17 +5636,17 @@ pref("media.block-autoplay-until-in-fore
 pref("layout.css.servo.enabled", true);
 #else
 pref("layout.css.servo.enabled", false);
 #endif
 
 // HSTS Priming
 // If a request is mixed-content, send an HSTS priming request to attempt to
 // see if it is available over HTTPS.
-#ifdef RELEASE_OR_BETA
+#ifdef RELEASE
 // Don't change the order of evaluation of mixed-content and HSTS upgrades in
 // order to be most compatible with current standards
 pref("security.mixed_content.send_hsts_priming", false);
 pref("security.mixed_content.use_hsts", false);
 #else
 // Change the order of evaluation so HSTS upgrades happen before
 // mixed-content blocking
 pref("security.mixed_content.send_hsts_priming", true);
--- a/security/manager/ssl/security-prefs.js
+++ b/security/manager/ssl/security-prefs.js
@@ -119,17 +119,17 @@ pref("security.ssl.errorReporting.automa
 // Impose a maximum age on HPKP headers, to avoid sites getting permanently
 // blacking themselves out by setting a bad pin.  (60 days by default)
 // https://tools.ietf.org/html/rfc7469#section-4.1
 pref("security.cert_pinning.max_max_age_seconds", 5184000);
 
 // HSTS Priming
 // If a request is mixed-content, send an HSTS priming request to attempt to
 // see if it is available over HTTPS.
-#ifdef RELEASE_OR_BETA
+#ifdef RELEASE
 // Don't change the order of evaluation of mixed-content and HSTS upgrades in
 // order to be most compatible with current standards
 pref("security.mixed_content.send_hsts_priming", false);
 pref("security.mixed_content.use_hsts", false);
 #else
 // Change the order of evaluation so HSTS upgrades happen before
 // mixed-content blocking
 pref("security.mixed_content.send_hsts_priming", true);