corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for bug 42342 [[regression] Text before ':' in URL is interpreted as protocol], we now try the www...com trick instead, not much better, but in alignment with our current fixup strategy, r=valeski@netscape.com, a=waterson@mozilla.org

Browse Source
This commit is contained in:
andreas.otte@primus-online.de
2000-07-14 22:21:52 +00:00
parent a4892284ef
commit a9c13ba8d1
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
docshell/base/nsDocShell.cpp
View File

@@ -2632,32 +2632,24 @@ NS_IMETHODIMP nsDocShell::CreateFixupURI(const PRUnichar* aStringURI,
return NS_OK;
// See if a protocol needs to be added
PRInt32 colon = uriString.FindChar(':');
PRInt32 fSlash = uriString.FindChar('/');
PRUnichar port = nsnull;;
// if no scheme (protocol) is found, assume http.
if (colon == -1 || fSlash == -1 || (fSlash > -1) && (colon+1 != fSlash)) {
if (colon < (((PRInt32)uriString.Length())-1)) {
if (colon != -1) port = uriString.CharAt(colon+1);
if (colon == -1 || uriString.IsDigit(port) ||
uriString.CharAt(0) == '[') {
// find host name
PRInt32 hostPos = uriString.FindCharInSet("./:");
if (hostPos == -1)
hostPos = uriString.Length();
PRInt32 checkprotocol = uriString.Find("://",0);
// if no scheme (protocol) is found, assume http or ftp.
if (checkprotocol == -1) {
// find host name
PRInt32 hostPos = uriString.FindCharInSet("./:");
if (hostPos == -1)
hostPos = uriString.Length();
// extract host name
nsAutoString hostSpec;
uriString.Left(hostSpec, hostPos);
// extract host name
nsAutoString hostSpec;
uriString.Left(hostSpec, hostPos);
// insert url spec corresponding to host name
if (hostSpec.EqualsIgnoreCase("ftp"))
uriString.InsertWithConversion("ftp://", 0, 6);
else
uriString.InsertWithConversion("http://", 0, 7);
}
}
} // end if colon
// insert url spec corresponding to host name
if (hostSpec.EqualsIgnoreCase("ftp"))
uriString.InsertWithConversion("ftp://", 0, 6);
else
uriString.InsertWithConversion("http://", 0, 7);
} // end if checkprotocol
return NS_NewURI(aURI, uriString.GetUnicode(), nsnull);
}