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

Fix for bug 81214. We were running the PAC routines even for non-relevant scheme URLs like chrome, file, etc. Added a check to only process proxy related ones. r=pavlov, sr=darin, a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@95863 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gagan%netscape.com
2001-05-24 07:12:06 +00:00
parent 84ed67d880
commit a8f57b8dad
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,6 +379,15 @@ nsProtocolProxyService::ExamineForProxy(nsIURI *aURI, char * *aProxyHost, PRInt3
*aProxyHost = nsnull;
*aProxyType = nsnull;
*aProxyPort = -1;
// we only know about http, https, ftp and gopher as yet...
// return nothing for others. See what happens otherwise in bug 81214
PRBool validScheme = PR_FALSE;
if ((NS_FAILED(aURI->SchemeIs("http", &validScheme)) || !validScheme) &&
(NS_FAILED(aURI->SchemeIs("https", &validScheme)) || !validScheme) &&
(NS_FAILED(aURI->SchemeIs("ftp", &validScheme)) || !validScheme ) &&
(NS_FAILED(aURI->SchemeIs("gopher", &validScheme)) || !validScheme))
return NS_OK;
// if proxies are enabled and this host:port combo is
// supposed to use a proxy, check for a proxy.
@@ -406,7 +415,7 @@ nsProtocolProxyService::ExamineForProxy(nsIURI *aURI, char * *aProxyHost, PRInt3
nsXPIDLCString scheme;
rv = aURI->GetScheme(getter_Copies(scheme));
if (NS_FAILED(rv)) return rv;
if (mHTTPProxyHost.get()[0] && mHTTPProxyPort > 0 &&
!PL_strcasecmp(scheme, "http")) {
*aProxyHost = PL_strdup(mHTTPProxyHost);