diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-07 10:20:41 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-07 10:20:41 +0100 |
| commit | 0fddf6e728ddea66a463e1ccd007aa9d48498905 (patch) | |
| tree | 65e28a16bbfcf1747ca41a6a808136ee578735d9 /devtools/shared | |
| parent | 210d6a87a2759887ce286288ab0815cbd0439e5a (diff) | |
| parent | 18159927e8f37a1858f9757803b20744fcfff505 (diff) | |
| download | UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar.gz UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar.lz UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar.xz UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.zip | |
Merge branch 'release' into Pale_Moon-release
Diffstat (limited to 'devtools/shared')
| -rw-r--r-- | devtools/shared/css/generated/properties-db.js | 6 | ||||
| -rw-r--r-- | devtools/shared/webconsole/test/test_network_security-hpkp.html | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js index 070167496..25d9e2d33 100644 --- a/devtools/shared/css/generated/properties-db.js +++ b/devtools/shared/css/generated/properties-db.js @@ -779,7 +779,8 @@ exports.CSS_PROPERTIES = { "column-gap" ], "supports": [ - 6 + 6, + 8 ], "values": [ "-moz-calc", @@ -5434,7 +5435,8 @@ exports.CSS_PROPERTIES = { "column-gap" ], "supports": [ - 6 + 6, + 8 ], "values": [ "-moz-calc", diff --git a/devtools/shared/webconsole/test/test_network_security-hpkp.html b/devtools/shared/webconsole/test/test_network_security-hpkp.html index 55e2621a8..bc1a9642c 100644 --- a/devtools/shared/webconsole/test/test_network_security-hpkp.html +++ b/devtools/shared/webconsole/test/test_network_security-hpkp.html @@ -17,7 +17,8 @@ SimpleTest.waitForExplicitFinish(); let gCurrentTestCase = -1; -const HPKP_PREF = "security.cert_pinning.process_headers_from_non_builtin_roots"; +const HPKP_ENABLED_PREF = "security.cert_pinning.hpkp.enabled"; +const PROCESS_HPKP_FROM_NON_BUILTIN_ROOTS_PREF = "security.cert_pinning.process_headers_from_non_builtin_roots"; // Static pins tested by unit/test_security-info-static-hpkp.js. const TEST_CASES = [ @@ -41,11 +42,11 @@ const TEST_CASES = [ function startTest() { - // Need to enable this pref or pinning headers are rejected due test - // certificate. - Services.prefs.setBoolPref(HPKP_PREF, true); + Services.prefs.setBoolPref(HPKP_ENABLED_PREF, true); + Services.prefs.setBoolPref(PROCESS_HPKP_FROM_NON_BUILTIN_ROOTS_PREF, true); SimpleTest.registerCleanupFunction(() => { - Services.prefs.setBoolPref(HPKP_PREF, false); + Services.prefs.setBoolPref(HPKP_ENABLED_PREF, false); + Services.prefs.setBoolPref(PROCESS_HPKP_FROM_NON_BUILTIN_ROOTS_PREF, false); // Reset pinning state. let gSSService = Cc["@mozilla.org/ssservice;1"] |