Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 03:24:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 49336

Browse Source 
r=av
sr=waterson

This code makes sure that if the prefs say to USE DIRECT instead of using
a proxy, the plugin sees it that way.
This commit is contained in:
edburns%acm.org 2001-02-03 02:56:28 +00:00
parent 332bf8d8c8
commit 983f562237
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@ -2067,6 +2067,7 @@ NS_IMETHODIMP nsPluginHostImpl::FindProxyForURL(const char* url, char* *result)
PRInt32 proxyPort = -1;
PRBool useDirect = PR_FALSE;
PRBool usePrefs = PR_TRUE;
PRInt32 proxyType = -1;
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);
@ -2115,6 +2116,15 @@ NS_IMETHODIMP nsPluginHostImpl::FindProxyForURL(const char* url, char* *result)
}
}
if (usePrefs) {
// first, see if the prefs say, use "direct connection to the
// internet".
// see bug http://bugzilla.mozilla.org/show_bug.cgi?id=48336
res = prefs->GetIntPref("network.proxy.type", &proxyType);
if (NS_FAILED(res) || 0 == proxyType) {
useDirect = PR_TRUE;
}
}
if (usePrefs && !useDirect) {
// If ProxyAutoConfig is not enabled, look to the prefs.
// If the host for this url is in the "no proxy for" list, just go

10
modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@ -2067,6 +2067,7 @@ NS_IMETHODIMP nsPluginHostImpl::FindProxyForURL(const char* url, char* *result)
PRInt32 proxyPort = -1;
PRBool useDirect = PR_FALSE;
PRBool usePrefs = PR_TRUE;
PRInt32 proxyType = -1;
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);
@ -2115,6 +2116,15 @@ NS_IMETHODIMP nsPluginHostImpl::FindProxyForURL(const char* url, char* *result)
}
}
if (usePrefs) {
// first, see if the prefs say, use "direct connection to the
// internet".
// see bug http://bugzilla.mozilla.org/show_bug.cgi?id=48336
res = prefs->GetIntPref("network.proxy.type", &proxyType);
if (NS_FAILED(res) || 0 == proxyType) {
useDirect = PR_TRUE;
}
}
if (usePrefs && !useDirect) {
// If ProxyAutoConfig is not enabled, look to the prefs.
// If the host for this url is in the "no proxy for" list, just go