Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 04:35:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed assertion due to invalid proxy configuration. Patch from Peter V. for bug 53080 r=dbaron@fas.harvard.edu sr=attinasi@netscape.com

Browse Source
This commit is contained in:
attinasi%netscape.com 2001-04-26 23:53:27 +00:00
parent df06bdf345
commit f5697e3021
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netwerk/base/src/nsProtocolProxyService.cpp
View File

@ -106,14 +106,17 @@ nsProtocolProxyService::PrefsChanged(const char* pref) {
if (!mPrefs) return;
nsresult rv = NS_OK;
PRBool reloadPAC = PR_FALSE;
nsXPIDLCString tempString;
if (!pref || !PL_strcmp(pref, "network.proxy.type"))
{
PRInt32 type = -1;
rv = mPrefs->GetIntPref("network.proxy.type",&type);
if (NS_SUCCEEDED(rv))
if (NS_SUCCEEDED(rv)) {
mUseProxy = type; // type == 2 is autoconfig stuff
reloadPAC = PR_TRUE;
}
}
if (!pref || !PL_strcmp(pref, "network.proxy.http"))
@ -214,11 +217,12 @@ nsProtocolProxyService::PrefsChanged(const char* pref) {
(void)LoadFilters((const char*)tempString);
}
if (!pref || !PL_strcmp(pref, "network.proxy.autoconfig_url"))
if ((!pref || !PL_strcmp(pref, "network.proxy.autoconfig_url") || reloadPAC) &&
(mUseProxy == 2))
{
rv = mPrefs->CopyCharPref("network.proxy.autoconfig_url",
getter_Copies(tempString));
if (NS_SUCCEEDED(rv)) {
if (NS_SUCCEEDED(rv) && (!reloadPAC || PL_strcmp(tempString, mPACURL))) {
mPACURL = nsCRT::strdup(tempString);
// create pac js component