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

r=mcafee, 27339. We were kicking *any* load failure to the keyword server, now we're a little more selective

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@60558 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
valeski%netscape.com
2000-02-12 01:22:25 +00:00
parent ba91b16f16
commit d81f5ea091
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/docshell/base/nsWebShell.cpp
View File

@@ -3019,18 +3019,23 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
nsCAutoString hostStr(buf);
PRInt32 dotLoc = hostStr.FindChar('.');
// First see if we should throw it to the keyword server.
NS_ASSERTION(mPrefs, "the webshell's pref service wasn't initialized");
PRBool keywordsEnabled = PR_FALSE;
rv = mPrefs->GetBoolPref("keyword.enabled", &keywordsEnabled);
if (NS_FAILED(rv)) return rv;
if (keywordsEnabled && (-1 == dotLoc)) {
// only send non-qualified hosts to the keyword server
nsAutoString keywordSpec("keyword:");
keywordSpec.Append(host);
return LoadURL(keywordSpec.GetUnicode(), "view");
} // end keywordsEnabled
if (aStatus == NS_ERROR_UNKNOWN_HOST
|| aStatus == NS_ERROR_CONNECTION_REFUSED
|| aStatus == NS_ERROR_NET_TIMEOUT) {
// First see if we should throw it to the keyword server.
NS_ASSERTION(mPrefs, "the webshell's pref service wasn't initialized");
PRBool keywordsEnabled = PR_FALSE;
rv = mPrefs->GetBoolPref("keyword.enabled", &keywordsEnabled);
if (NS_FAILED(rv)) return rv;
if (keywordsEnabled && (-1 == dotLoc)) {
// only send non-qualified hosts to the keyword server
nsAutoString keywordSpec("keyword:");
keywordSpec.Append(host);
return LoadURL(keywordSpec.GetUnicode(), "view");
} // end keywordsEnabled
}
// Doc failed to load because the host was not found.
if (aStatus == NS_ERROR_UNKNOWN_HOST) {