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

Bug 77307: ``%27 codes after url redirection'', r=rpotts, sr=shaver, a=asa@mozilla.org

Browse Source 
Bug 79582: ``content refresh with non-digit chars before ; not parsed "correctly"'', r=rpotts, sr=ben, a=asa@mozilla.org
This commit is contained in:
jaggernaut@netscape.com
2001-06-11 22:05:59 +00:00
parent f3272a7a6f
commit a0037f7e6f
1 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
docshell/base/nsDocShell.cpp
View File

@@ -4977,38 +4977,22 @@ nsDocShell::RefreshURIFromHeader(nsIURI * aBaseURI,
++iter;
}
// bug 22886, part 2: allow X to start with or contain a '.'
if (iter != doneIterating && *iter == '.') {
++iter;
// throw away any digits following it
while (iter != doneIterating && (*iter >= '0' && *iter <= '9'))
++iter;
}
if (iter != doneIterating) {
// if this isn't whitespace, a ';' or a ',', we just parsed part of a URI
if (!(nsCRT::IsAsciiSpace(*iter) || *iter == ';' || *iter == ',')) {
// back to square 1
iter = tokenStart;
seconds = 0;
}
else {
// if we started with a '-', number is negative
if (*tokenStart == '-')
seconds = -seconds;
// if we started with a '-', number is negative
if (*tokenStart == '-')
seconds = -seconds;
// skip to next ';' or ','
while (iter != doneIterating && !(*iter == ';' || *iter == ','))
++iter;
// skip ';' or ','
if (iter != doneIterating && (*iter == ';' || *iter == ',')) {
++iter;
// skip whitespace
while (iter != doneIterating && nsCRT::IsAsciiSpace(*iter))
++iter;
// skip ';' or ','
if (iter != doneIterating && (*iter == ';' || *iter == ',')) {
++iter;
// skip whitespace
while (iter != doneIterating && nsCRT::IsAsciiSpace(*iter))
++iter;
}
}
}
@@ -5041,8 +5025,8 @@ nsDocShell::RefreshURIFromHeader(nsIURI * aBaseURI,
}
}
// skip a leading '"' (believe it or not, '\'' is a valid URI char)
if (tokenStart != doneIterating && *tokenStart == '"')
// skip a leading '"' or '\''
if (tokenStart != doneIterating && (*tokenStart == '"' || *tokenStart == '\''))
++tokenStart;
// set iter to start of URI
@@ -5050,11 +5034,17 @@ nsDocShell::RefreshURIFromHeader(nsIURI * aBaseURI,
// tokenStart here points to the beginning of URI
// skip anything which isn't whitespace or '"')
while (iter != doneIterating
&& !(nsCRT::IsAsciiSpace(*iter) || *iter == '"'))
// skip anything which isn't whitespace
while (iter != doneIterating && !nsCRT::IsAsciiSpace(*iter))
++iter;
// move iter one back if the last character is a '"' or '\''
if (iter != tokenStart) {
--iter;
if (!(*iter == '"' || *iter == '\''))
++iter;
}
// URI is whatever's contained from tokenStart to iter.
// note: if tokenStart == doneIterating, so is iter.