moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Expect links followed from Refreshes to contain URLs.

Browse Source
This commit is contained in:
hniksic 2003-10-13 07:32:25 -07:00
parent 7487dbfa81
commit 5535c9ff17
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2003-10-13 Hrvoje Niksic <hniksic@xemacs.org>
* html-url.c (tag_handle_meta): Set the Refresh link to expect
HTML.
(append_one_url): Renamed to append_url.
2003-10-13 Hrvoje Niksic <hniksic@xemacs.org> 2003-10-13 Hrvoje Niksic <hniksic@xemacs.org>
* sysdep.h: Only define u_int32_t. * sysdep.h: Only define u_int32_t.

15
src/html-url.c
View File

@ -270,8 +270,8 @@ struct map_context {
size. */ size. */
static struct urlpos * static struct urlpos *
append_one_url (const char *link_uri, append_url (const char *link_uri,
struct taginfo *tag, int attrind, struct map_context *ctx) struct taginfo *tag, int attrind, struct map_context *ctx)
{ {
int link_has_scheme = url_has_scheme (link_uri); int link_has_scheme = url_has_scheme (link_uri);
struct urlpos *newel; struct urlpos *newel;
@ -400,7 +400,7 @@ tag_find_urls (int tagid, struct taginfo *tag, struct map_context *ctx)
if (0 == strcasecmp (tag->attrs[attrind].name, if (0 == strcasecmp (tag->attrs[attrind].name,
tag_url_attributes[i].attr_name)) tag_url_attributes[i].attr_name))
{ {
struct urlpos *up = append_one_url (link, tag, attrind, ctx); struct urlpos *up = append_url (link, tag, attrind, ctx);
if (up) if (up)
{ {
int flags = tag_url_attributes[i].flags; int flags = tag_url_attributes[i].flags;
@ -425,7 +425,7 @@ tag_handle_base (int tagid, struct taginfo *tag, struct map_context *ctx)
if (!newbase) if (!newbase)
return; return;
base_urlpos = append_one_url (newbase, tag, attrind, ctx); base_urlpos = append_url (newbase, tag, attrind, ctx);
if (!base_urlpos) if (!base_urlpos)
return; return;
base_urlpos->ignore_when_downloading = 1; base_urlpos->ignore_when_downloading = 1;
@ -448,7 +448,7 @@ tag_handle_form (int tagid, struct taginfo *tag, struct map_context *ctx)
char *action = find_attr (tag, "action", &attrind); char *action = find_attr (tag, "action", &attrind);
if (action) if (action)
{ {
struct urlpos *up = append_one_url (action, tag, attrind, ctx); struct urlpos *up = append_url (action, tag, attrind, ctx);
if (up) if (up)
up->ignore_when_downloading = 1; up->ignore_when_downloading = 1;
} }
@ -471,7 +471,7 @@ tag_handle_link (int tagid, struct taginfo *tag, struct map_context *ctx)
*/ */
if (href) if (href)
{ {
struct urlpos *up = append_one_url (href, tag, attrind, ctx); struct urlpos *up = append_url (href, tag, attrind, ctx);
if (up) if (up)
{ {
char *rel = find_attr (tag, "rel", NULL); char *rel = find_attr (tag, "rel", NULL);
@ -528,11 +528,12 @@ tag_handle_meta (int tagid, struct taginfo *tag, struct map_context *ctx)
while (ISSPACE (*p)) while (ISSPACE (*p))
++p; ++p;
entry = append_one_url (p, tag, attrind, ctx); entry = append_url (p, tag, attrind, ctx);
if (entry) if (entry)
{ {
entry->link_refresh_p = 1; entry->link_refresh_p = 1;
entry->refresh_timeout = timeout; entry->refresh_timeout = timeout;
entry->link_expect_html = 1;
} }
} }
else if (name && 0 == strcasecmp (name, "robots")) else if (name && 0 == strcasecmp (name, "robots"))