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] Don't pattern-match server redirects.

Browse Source
This commit is contained in:
hniksic 2005-06-25 08:04:47 -07:00
parent 002def87d2
commit bd74e419d6
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2005-06-25 Hrvoje Niksic <hniksic@xemacs.org>
* http.c (http_loop): Don't warn about wildcards in HTTP URLs if
globbing isn't requested in the first place.
* retr.c (retrieve_url): Temporarily turn off globbing when
processing HTTP->FTP redirects.
2005-06-25 Hrvoje Niksic <hniksic@xemacs.org> 2005-06-25 Hrvoje Niksic <hniksic@xemacs.org>
* utils.c (with_thousand_seps_sum): Now defined only if * utils.c (with_thousand_seps_sum): Now defined only if

2
src/http.c
View File

@ -1996,7 +1996,7 @@ http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
*newloc = NULL; *newloc = NULL;
/* Warn on (likely bogus) wildcard usage in HTTP. */ /* Warn on (likely bogus) wildcard usage in HTTP. */
if (has_wildcards_p (u->path)) if (opt.ftp_glob && has_wildcards_p (u->path))
logputs (LOG_VERBOSE, _("Warning: wildcards not supported in HTTP.\n")); logputs (LOG_VERBOSE, _("Warning: wildcards not supported in HTTP.\n"));
xzero (hstat); xzero (hstat);

12
src/retr.c
View File

@ -660,14 +660,16 @@ retrieve_url (const char *origurl, char **file, char **newloc,
} }
else if (u->scheme == SCHEME_FTP) else if (u->scheme == SCHEME_FTP)
{ {
/* If this is a redirection, we must not allow recursive FTP /* If this is a redirection, temporarily turn off opt.ftp_glob
retrieval, so we save recursion to oldrec, and restore it and opt.recursive, both being undesirable when following
later. */ redirects. */
bool oldrec = opt.recursive; bool oldrec = opt.recursive, oldglob = opt.ftp_glob;
if (redirection_count) if (redirection_count)
opt.recursive = false; opt.recursive = opt.ftp_glob = false;
result = ftp_loop (u, dt, proxy_url); result = ftp_loop (u, dt, proxy_url);
opt.recursive = oldrec; opt.recursive = oldrec;
opt.ftp_glob = oldglob;
/* There is a possibility of having HTTP being redirected to /* There is a possibility of having HTTP being redirected to
FTP. In these cases we must decide whether the text is HTML FTP. In these cases we must decide whether the text is HTML