Bug 128234/128045 - http proxy was being tried even when the protocol

didn't allow it.
r=dougt, sr=darin, a=blizzard


git-svn-id: svn://10.0.0.236/trunk@115551 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bbaetz%student.usyd.edu.au
2002-03-01 03:51:26 +00:00
parent f5dcb16a4d
commit 5fd1019b70

View File

@@ -407,8 +407,8 @@ nsProtocolProxyService::ExamineForProxy(nsIURI *aURI, nsIProxyInfo* *aResult) {
&proxyInfo->mType);
if (NS_FAILED(rv) || !proxyInfo->Type() || // If: it didn't work
!PL_strcasecmp("direct", proxyInfo->Type()) || // OR we're meant to go direct
(PL_strcasecmp("http", proxyInfo->Type()) != 0 && // OR we're an http proxy...
!(flags & nsIProtocolHandler::ALLOWS_PROXY_HTTP))) { // ... but we can't proxy with http
(!PL_strcasecmp("http", proxyInfo->Type()) && // OR we're an http proxy...
!(flags & nsIProtocolHandler::ALLOWS_PROXY_HTTP))) { // ... but we can't proxy with http
delete proxyInfo; // don't proxy this
} else {
if (proxyInfo->Port() <= 0)