r=rhp. we want to reset any previously set proxy info if we're not supposed to be using proxies.

This commit is contained in:
valeski%netscape.com 2000-02-16 00:07:55 +00:00
parent e2429cef3e
commit 24868a22e8

View File

@ -198,8 +198,13 @@ nsProtocolProxyService::ExamineForProxy(nsIURI *aURI, nsIProxy *aProxy) {
// if proxies are enabled and this host:port combo is
// supposed to use a proxy, check for a proxy.
if (!mUseProxy) return NS_OK;
if (!CanUseProxy(aURI)) return NS_OK;
if (!mUseProxy || !CanUseProxy(aURI)) {
rv = aProxy->SetProxyHost(nsnull);
if (NS_FAILED(rv)) return rv;
rv = aProxy->SetProxyPort(-1);
if (NS_FAILED(rv)) return rv;
return NS_OK;
}
nsXPIDLCString scheme;
rv = aURI->GetScheme(getter_Copies(scheme));