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

fix bug 32997, file URLs that include a hostname don't work, look for a hostname and do some special work on detecting drivenames for XP_PC, r=gagan@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@69557 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
andreas.otte%primus-online.de
2000-05-13 12:00:38 +00:00
parent 4f704d5fd3
commit 78da1efce2
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla/netwerk/base/src/nsNoAuthURLParser.cpp
View File

@@ -113,12 +113,36 @@ nsresult
nsNoAuthURLParser::ParseAtHost(const char* i_Spec, char* *o_Host,
PRInt32 *o_Port, char* *o_Path)
{
// Usually there is no Host, but who knows ...
nsresult rv = NS_OK;
// There is no Host, but take care of a localhost
if ((nsCRT::strcasecmp(i_Spec,"localhost")==0) ||
(PL_strcasestr(i_Spec,"localhost/")==i_Spec))
return ParseAtPath(i_Spec+9,o_Path);
rv = ParseAtPath(i_Spec, o_Path);
PRInt32 len = PL_strlen(i_Spec);
if ((*i_Spec == '/')
#ifdef XP_PC
// special case for XP_PC: look for a drive
|| (len > 1 && (*(i_Spec+1) == ':' || *(i_Spec+1) == '|'))
#endif
){
// No host, okay ...
rv = ParseAtPath(i_Spec, o_Path);
} else {
// There seems be a host, drop it
char* brk = PL_strchr(i_Spec, '/');
if (!brk) {
// everything is the host
rv = DupString(o_Host, i_Spec);
if (NS_FAILED(rv)) return rv;
ToLowerCase(*o_Host);
// parse after the host
rv = ParseAtPath(i_Spec+len, o_Path);
} else {
rv = ExtractString((char*)i_Spec, o_Host, (brk - i_Spec));
if (NS_FAILED(rv)) return rv;
ToLowerCase(*o_Host);
// parse after the host
rv = ParseAtPath(brk, o_Path);
}
}
return rv;
}