From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- browser/components/preferences/dialogs/connection.js | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'browser/components/preferences/dialogs/connection.js') diff --git a/browser/components/preferences/dialogs/connection.js b/browser/components/preferences/dialogs/connection.js index 0b21b1b5a5..33e8deb279 100644 --- a/browser/components/preferences/dialogs/connection.js +++ b/browser/components/preferences/dialogs/connection.js @@ -16,6 +16,7 @@ Preferences.addAll([ // both initialized when network.proxy.type initialization triggers a call to // gConnectionsDialog.updateReloadButton(). { id: "network.proxy.autoconfig_url", type: "string" }, + { id: "network.proxy.system_wpad", type: "bool" }, { id: "network.proxy.type", type: "int" }, { id: "network.proxy.http", type: "string" }, { id: "network.proxy.http_port", type: "int" }, @@ -130,11 +131,20 @@ var gConnectionsDialog = { checkForSystemProxy() { if ("@mozilla.org/system-proxy-settings;1" in Cc) { document.getElementById("systemPref").removeAttribute("hidden"); + + var systemWpadAllowed = Preferences.get( + "network.proxy.system_wpad.allowed" + ); + if (systemWpadAllowed && Services.appinfo.OS == "WINNT") { + document.getElementById("systemWpad").removeAttribute("hidden"); + } } }, proxyTypeChanged() { var proxyTypePref = Preferences.get("network.proxy.type"); + var systemWpadPref = Preferences.get("network.proxy.system_wpad"); + systemWpadPref.updateControlDisabledState(proxyTypePref.value != 5); // Update http var httpProxyURLPref = Preferences.get("network.proxy.http"); -- cgit v1.2.3