Bug 1246540: remove accidentally checked-in .rej file rs=ritu a=ritu
authorRandell Jesup <rjesup@jesup.org>
Mon, 10 Oct 2016 15:53:26 -0400
changeset 358250 c08442f25ba3d601ac50c0b2294e483d6cbf531f
parent 358249 45b02f351fd3b2f9e91a889651b3a1962b94cffa
child 358251 181a64b1364bfe92006cb772258a8b43d7d83e7d
push id1324
push usermtabara@mozilla.com
push dateMon, 16 Jan 2017 13:07:44 +0000
treeherdermozilla-release@a01c49833940 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersritu, ritu
bugs1246540
milestone51.0a2
Bug 1246540: remove accidentally checked-in .rej file rs=ritu a=ritu
modules/libpref/init/all.js.rej
deleted file mode 100644
--- a/modules/libpref/init/all.js.rej
+++ /dev/null
@@ -1,33 +0,0 @@
-***************
-*** 5562,5569 ****
-  pref("dom.webkitBlink.filesystem.enabled", true);
-  #endif
-  
-  pref("media.block-autoplay-until-in-foreground", true);
-  #ifdef MOZ_STYLO
-  // Is the Servo-backed style system enabled?
-  pref("layout.css.servo.enabled", true);
-  #endif
---- 5562,5583 ----
-  pref("dom.webkitBlink.filesystem.enabled", true);
-  #endif
-  
-  pref("media.block-autoplay-until-in-foreground", true);
-  #ifdef MOZ_STYLO
-  // Is the Servo-backed style system enabled?
-  pref("layout.css.servo.enabled", true);
-  #endif
-+ 
-+ // HSTS Priming
-+ // If a request is mixed-content, send an HSTS priming request to attempt to
-+ // see if it is available over HTTPS.
-+ pref("security.mixed_content.send_hsts_priming", true);
-+ #ifdef RELEASE_BUILD
-+ // 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.use_hsts", false);
-+ #else
-+ // Change the order of evaluation so HSTS upgrades happen before
-+ // mixed-content blocking
-+ pref("security.mixed_content.use_hsts", true);
-+ #endif