aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-11-04 08:17:17 -05:00
Code

Let be more tolerant with buggy meta refresh. It should fix bug 767.

Browse Source 
[ From commit 36a277540c in ELinks
  0.12.GIT.  --KON ]
This commit is contained in:
Laurent MONIN 2006-07-10 21:16:14 +02:00 committed by Kalle Olavi Niemitalo
parent 73696e34ce
commit b918ab57de
1 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/document/html/parser.c
View File

@ -262,6 +262,36 @@ html_skip(struct html_context *html_context, unsigned char *a)
html_top.type = ELEMENT_DONT_KILL; html_top.type = ELEMENT_DONT_KILL;
} }
/* Parse meta refresh without URL= in it:
* <meta http-equiv="refresh" content="3,http://elinks.or.cz/">
* <meta http-equiv="refresh" content="3; http://elinks.or.cz/">
* <meta http-equiv="refresh" content=" 3 ; http://elinks.or.cz/ ">
*/
static void
parse_old_meta_refresh(unsigned char *str, unsigned char **ret)
{
unsigned char *p = str;
int len;
assert(str && ret);
if_assert_failed return;
*ret = NULL;
while (*p && (*p == ' ' || *p == ASCII_TAB)) p++;
if (!*p) return;
while (*p && *p >= '0' && *p <= '9') p++;
if (!*p) return;
while (*p && (*p == ' ' || *p == ASCII_TAB)) p++;
if (!*p) return;
if (*p == ';' || *p == ',') p++; else return;
while (*p && (*p == ' ' || *p == ASCII_TAB)) p++;
if (!*p) return;
len = strlen(p);
while (len && (p[len] == ' ' || p[len] == ASCII_TAB)) len--;
if (len) *ret = memacpy(p, len);
}
void void
process_head(struct html_context *html_context, unsigned char *head) process_head(struct html_context *html_context, unsigned char *head)
{ {
@ -272,9 +302,13 @@ process_head(struct html_context *html_context, unsigned char *head)
url = parse_header_param(refresh, "URL"); url = parse_header_param(refresh, "URL");
if (!url) { if (!url) {
/* If the URL parameter is missing assume that the /* Let's try a more tolerant parsing. */
* document being processed should be refreshed. */ parse_old_meta_refresh(refresh, &url);
url = get_uri_string(html_context->base_href, URI_ORIGINAL); if (!url) {
/* If the URL parameter is missing assume that the
* document being processed should be refreshed. */
url = get_uri_string(html_context->base_href, URI_ORIGINAL);
}
} }
if (url) { if (url) {