moparisthebest
/
wget
mirror of https://github.com/moparisthebest/wget
1
0
Fork 0
Code Issues Releases Wiki Activity

[svn] Fixed recursive FTP retrieval over proxy.

This commit is contained in:
mtortonesi 2006-06-12 09:26:28 -07:00
parent f2613b6ddb
commit 9d9f134fdf
3 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ChangeLog
View File

@ -1,3 +1,21 @@
2006-06-12 Mauro Tortonesi <mauro@ferrara.linux.it>
* retr.c (retrieve_from_file): Use retrieve_tree and automatically
turn on opt.follow_ftp in case of recursive FTP retrieval through HTTP
proxy.
* main.c: Automatically turn on opt.follow_ftp in case of recursive
FTP retrieval through HTTP proxy.
2006-06-12 Tony Lewis <tlewis@exelana.com>
* main.c: Improved CHEN Peng's patch by proposing a simpler logic.
2006-06-12 CHEN Peng <chenpeng@alumni.nus.edu.sg>
* main.c: Use retrieve_tree in case of recursive FTP retrieval through
HTTP proxy.
2006-05-25 Mauro Tortonesi <mauro@ferrara.linux.it>
* convert.c: Added mechanisms to keep track broken links.

14
src/main.c
View File

@ -945,8 +945,18 @@ Can't timestamp and not clobber old files at the same time.\n"));
int dt;
if ((opt.recursive || opt.page_requisites)
&& url_scheme (*t) != SCHEME_FTP)
status = retrieve_tree (*t);
&& (url_scheme (*t) != SCHEME_FTP || opt.use_proxy))
{
int old_follow_ftp = opt.follow_ftp;
/* Turn opt.follow_ftp on in case of recursive FTP retrieval */
if (url_scheme (*t) == SCHEME_FTP)
opt.follow_ftp = 1;
status = retrieve_tree (*t);
opt.follow_ftp = old_follow_ftp;
}
else
status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt, opt.recursive);

14
src/retr.c
View File

@ -844,8 +844,18 @@ retrieve_from_file (const char *file, bool html, int *count)
break;
}
if ((opt.recursive || opt.page_requisites)
&& cur_url->url->scheme != SCHEME_FTP)
status = retrieve_tree (cur_url->url->url);
&& (cur_url->url->scheme != SCHEME_FTP || opt.use_proxy))
{
int old_follow_ftp = opt.follow_ftp;
/* Turn opt.follow_ftp on in case of recursive FTP retrieval */
if (cur_url->url->scheme == SCHEME_FTP)
opt.follow_ftp = 1;
status = retrieve_tree (cur_url->url->url);
opt.follow_ftp = old_follow_ftp;
}
else
status = retrieve_url (cur_url->url->url, &filename, &new_file, NULL, &dt, opt.recursive);