From eb7532fd4d4bf44c01fa434d3145e05b4b93eca8 Mon Sep 17 00:00:00 2001 From: Cameron Kaiser Date: Fri, 15 Mar 2019 21:06:16 -0700 Subject: [PATCH] #546 and #548: M1503393 M1524214 M1524755 M1525145 M1516754 M1518774 M1524264 M1530103 M1531277 --- browser/components/preferences/connection.js | 2 +- browser/components/preferences/connection.xul | 6 +- dom/html/HTMLTableElement.cpp | 15 +- dom/html/HTMLTableSectionElement.cpp | 2 +- dom/media/mediasource/TrackBuffersManager.cpp | 1 + .../platforms/minimp3/MiniMP3Decoder.cpp | 8 + dom/smil/nsSMILAnimationController.cpp | 2 +- layout/base/nsPresShell.cpp | 3 +- mfbt/RangedPtr.h | 2 +- netwerk/base/nsProtocolProxyService.cpp | 6 + netwerk/dns/effective_tld_names.dat | 61 +- security/manager/ssl/StaticHPKPins.h | 24 +- security/manager/ssl/nsSTSPreloadList.inc | 4387 ++++++++++++----- toolkit/xre/nsAppRunner.cpp | 14 +- xpcom/io/nsStringStream.cpp | 33 +- 15 files changed, 3221 insertions(+), 1345 deletions(-) diff --git a/browser/components/preferences/connection.js b/browser/components/preferences/connection.js index 81e4e1178..ff5b0ab08 100644 --- a/browser/components/preferences/connection.js +++ b/browser/components/preferences/connection.js @@ -76,7 +76,7 @@ var gConnectionsDialog = { var autologinProxyPref = document.getElementById("signon.autologin.proxy"); autologinProxyPref.disabled = proxyTypePref.value == 0; var noProxiesPref = document.getElementById("network.proxy.no_proxies_on"); - noProxiesPref.disabled = proxyTypePref.value != 1; + noProxiesPref.disabled = proxyTypePref.value == 0; var autoconfigURLPref = document.getElementById("network.proxy.autoconfig_url"); autoconfigURLPref.disabled = proxyTypePref.value != 2; diff --git a/browser/components/preferences/connection.xul b/browser/components/preferences/connection.xul index 7debc2bf8..10fc70de4 100644 --- a/browser/components/preferences/connection.xul +++ b/browser/components/preferences/connection.xul @@ -146,9 +146,6 @@ -