Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 212852: Browser assumes ftp protocol for URL's beginning with 'ftp' and written without protocol in address field, patch by Magnus Melin <mkmelin+mozilla@iki.fi>, r=biesi, sr=darin

Browse Source
This commit is contained in:
gavin%gavinsharp.com 2006-12-16 14:32:19 +00:00
parent 1890b3cbc7
commit b0de55cc73
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
docshell/base/nsDefaultURIFixup.cpp
View File

@ -302,7 +302,7 @@ nsDefaultURIFixup::CreateFixupURI(const nsACString& aStringURI, PRUint32 aFixupF
//
// no-scheme.com
// ftp.no-scheme.com
// ftp4.no-scheme,com
// ftp4.no-scheme.com
// no-scheme.com/query?foo=http://www.foo.com
//
PRInt32 schemeDelim = uriString.Find("://",0);
@ -319,7 +319,7 @@ nsDefaultURIFixup::CreateFixupURI(const nsACString& aStringURI, PRUint32 aFixupF
uriString.Left(hostSpec, hostPos);
// insert url spec corresponding to host name
if (hostSpec.EqualsIgnoreCase("ftp", 3))
if (IsLikelyFTP(hostSpec))
uriString.Assign(NS_LITERAL_CSTRING("ftp://") + uriString);
else
uriString.Assign(NS_LITERAL_CSTRING("http://") + uriString);
@ -503,6 +503,44 @@ PRBool nsDefaultURIFixup::MakeAlternateURI(nsIURI *aURI)
return PR_TRUE;
}
/**
* Check if the host name starts with ftp\d*\. and it's not directly followed
* by the tld.
*/
PRBool nsDefaultURIFixup::IsLikelyFTP(const nsCString &aHostSpec)
{
PRBool likelyFTP = PR_FALSE;
if (aHostSpec.EqualsIgnoreCase("ftp", 3)) {
nsACString::const_iterator iter;
nsACString::const_iterator end;
aHostSpec.BeginReading(iter);
aHostSpec.EndReading(end);
iter.advance(3); // move past the "ftp" part
while (iter != end)
{
if (*iter == '.') {
// now make sure the name has at least one more dot in it
++iter;
while (iter != end)
{
if (*iter == '.') {
likelyFTP = PR_TRUE;
break;
}
++iter;
}
break;
}
else if (!nsCRT::IsAsciiDigit(*iter)) {
break;
}
++iter;
}
}
return likelyFTP;
}
nsresult nsDefaultURIFixup::FileURIFixup(const nsACString& aStringURI,
nsIURI** aURI)
{

1
docshell/base/nsDefaultURIFixup.h
View File

@ -67,6 +67,7 @@ private:
PRBool PossiblyByteExpandedFileName(const nsAString& aIn);
PRBool PossiblyHostPortUrl(const nsACString& aUrl);
PRBool MakeAlternateURI(nsIURI *aURI);
PRBool IsLikelyFTP(const nsCString& aHostSpec);
const char * GetFileSystemCharset();
const char * GetCharsetForUrlBar();