forked from pool/MozillaFirefox
a9628fa6ae
* https://www.mozilla.org/en-US/firefox/74.0/releasenotes/ MFSA 2020-08 (bsc#1166238) * CVE-2020-6805 (bmo#1610880) Use-after-free when removing data about origins * CVE-2020-6806 (bmo#1612308) BodyStream::OnInputStreamReady was missing protections against state confusion * CVE-2020-6807 (bmo#1614971) Use-after-free in cubeb during stream destruction * CVE-2020-6808 (bmo#1247968) URL Spoofing via javascript: URL * CVE-2020-6809 (bmo#1420296) Web Extensions with the all-urls permission could access local files * CVE-2020-6810 (bmo#1432856) Focusing a popup while in fullscreen could have obscured the fullscreen notification * CVE-2020-6811 (bmo#1607742) Devtools' 'Copy as cURL' feature did not fully escape website-controlled data, potentially leading to command injection * CVE-2019-20503 (bmo#1613765) Out of bounds reads in sctp_load_addresses_from_init * CVE-2020-6812 (bmo#1616661) The names of AirPods with personally identifiable information were exposed to websites with camera or microphone permission * CVE-2020-6813 (bmo#1605814) @import statements in CSS could bypass the Content Security Policy nonce feature * CVE-2020-6814 (bmo#1592078,bmo#1604847,bmo#1608256,bmo#1612636, OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=809
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
# HG changeset patch
|
|
# User Wolfgang Rosenauer
|
|
# Date 1558442915 -7200
|
|
# Tue May 21 14:48:35 2019 +0200
|
|
# Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5
|
|
# Parent dc1684693eed684bdafeff0ad78d4f6d288fcae1
|
|
Do not use gconf for proxy settings if not running within Gnome
|
|
Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
===================================================================
|
|
RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v
|
|
retrieving revision 1.1
|
|
|
|
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
@@ -49,21 +49,24 @@ NS_IMETHODIMP
|
|
nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
|
|
// dbus prevents us from being threadsafe, but this routine should not block
|
|
// anyhow
|
|
*aMainThreadOnly = true;
|
|
return NS_OK;
|
|
}
|
|
|
|
void nsUnixSystemProxySettings::Init() {
|
|
- mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
|
- if (mGSettings) {
|
|
- mGSettings->GetCollectionForSchema(
|
|
- NS_LITERAL_CSTRING("org.gnome.system.proxy"),
|
|
- getter_AddRefs(mProxySettings));
|
|
+ const char* sessionType = PR_GetEnv("DESKTOP_SESSION");
|
|
+ if (sessionType && !strcmp(sessionType, "gnome")) {
|
|
+ mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
|
+ if (mGSettings) {
|
|
+ mGSettings->GetCollectionForSchema(
|
|
+ NS_LITERAL_CSTRING("org.gnome.system.proxy"),
|
|
+ getter_AddRefs(mProxySettings));
|
|
+ }
|
|
}
|
|
}
|
|
|
|
nsresult nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) {
|
|
if (mProxySettings) {
|
|
nsCString proxyMode;
|
|
// Check if mode is auto
|
|
nsresult rv =
|