Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 20:42:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug 113032 [jar: anchors within pages drop the HTML file name] fix resolving relative jar urls, fix anchor handling in jar urls, r=darin, sr=bzbarsky

Browse Source
This commit is contained in:
andreas.otte%debitel.net 2003-03-15 20:00:20 +00:00
parent fa8fca68e4
commit 1bf6cb18fb
3 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/libjar/nsJARURI.cpp
View File

@ -335,12 +335,27 @@ nsJARURI::Resolve(const nsACString &relativePath, nsACString &result)
}
nsCAutoString path(mJAREntry);
PRInt32 pos = path.RFind("/");
if (pos >= 0)
path.Truncate(pos + 1);
else
path = "";
PRInt32 pos = 0;
char first = relativePath.Length() > 0 ? relativePath.First() : '#';
switch (first) {
case '/':
path = "";
break;
case '?':
case '#':
pos = path.RFindChar(first);
if (pos >= 0)
path.Truncate(pos);
break;
default:
pos = path.RFindChar('/');
if (pos >= 0)
path.Truncate(pos + 1);
else
path = "";
}
nsCAutoString resolvedEntry;
rv = net_ResolveRelativePath(relativePath, path,
resolvedEntry);

10
netwerk/base/src/nsURLHelper.cpp
View File

@ -383,7 +383,7 @@ net_ResolveRelativePath(const nsACString &relativePath,
if ( !path.IsEmpty() ) {
PRUnichar last = path.Last();
needsDelim = !(last == '/' || last == '\\' );
needsDelim = !(last == '/');
}
nsACString::const_iterator beg, end;
@ -403,18 +403,20 @@ net_ResolveRelativePath(const nsACString &relativePath,
stop = PR_TRUE;
// fall through...
case '/':
case '\\':
// delimiter found
if (name.Equals("..")) {
// pop path
// If we already have the delim at end, then
// skip over that when searching for next one to the left
PRInt32 offset = path.Length() - (needsDelim ? 1 : 2);
// First check for errors
if (offset < 0 )
return NS_ERROR_MALFORMED_URI;
PRInt32 pos = path.RFind("/", PR_FALSE, offset);
if (pos > 0)
if (pos >= 0)
path.Truncate(pos + 1);
else
return NS_ERROR_MALFORMED_URI;
path.Truncate();
}
else if (name.Equals(".") || name.Equals("")) {
// do nothing

25
netwerk/protocol/jar/src/nsJARURI.cpp
View File

@ -335,12 +335,27 @@ nsJARURI::Resolve(const nsACString &relativePath, nsACString &result)
}
nsCAutoString path(mJAREntry);
PRInt32 pos = path.RFind("/");
if (pos >= 0)
path.Truncate(pos + 1);
else
path = "";
PRInt32 pos = 0;
char first = relativePath.Length() > 0 ? relativePath.First() : '#';
switch (first) {
case '/':
path = "";
break;
case '?':
case '#':
pos = path.RFindChar(first);
if (pos >= 0)
path.Truncate(pos);
break;
default:
pos = path.RFindChar('/');
if (pos >= 0)
path.Truncate(pos + 1);
else
path = "";
}
nsCAutoString resolvedEntry;
rv = net_ResolveRelativePath(relativePath, path,
resolvedEntry);