Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 421490 - "wpad may be dangerous, and it is on by default" (only use WPAD if explicitly set in the prefs) [p=ventnor.bugzilla@yahoo.com.au (Michael Ventnor) r+sr=roc a=blocking1.9+]

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@247372 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
reed%reedloden.com 2008-03-08 09:58:17 +00:00
parent 08b702709d
commit 06826d529f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -485,17 +485,17 @@ nsProtocolProxyService::PrefsChanged(nsIPrefBranch *prefBranch,
if (mProxyConfig == eProxyConfig_PAC) {
prefBranch->GetCharPref(PROXY_PREF("autoconfig_url"),
getter_Copies(tempString));
} else {
} else if (mProxyConfig == eProxyConfig_WPAD) {
// We diverge from the WPAD spec here in that we don't walk the
// hosts's FQDN, stripping components until we hit a TLD. Doing so
// is dangerous in the face of an incomplete list of TLDs, and TLDs
// get added over time. We could consider doing only a single
// substitution of the first component, if that proves to help
// compatibility.
if (mSystemProxySettings)
mSystemProxySettings->GetPACURI(tempString);
else
tempString.AssignLiteral(WPAD_URL);
tempString.AssignLiteral(WPAD_URL);
} else if (mSystemProxySettings) {
// Get System Proxy settings if available
mSystemProxySettings->GetPACURI(tempString);
}
if (!tempString.IsEmpty())
ConfigureFromPAC(tempString);