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

If --content-disposition is used, do not send a HEAD request.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2010-06-03 16:46:56 +02:00
parent e0c25f7a5f
commit bd5527dad4
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -23,6 +23,9 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
** Cope better with unclosed html tags. ** Cope better with unclosed html tags.
** Print diagnostic messages to stderr, not stdout. ** Print diagnostic messages to stderr, not stdout.
** Do not use an additional HEAD request when --content-disposition is used,
but use directly GET.
* Changes in Wget 1.12 * Changes in Wget 1.12

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2010-06-03 Giuseppe Scrivano <gscrivano@gnu.org>
* http.c (http_loop): Do not send a HEAD request before the GET request
when --content-disposition is used.
Reported by: alex_wh@mail.ru.
2010-05-31 Giuseppe Scrivano <gscrivano@gnu.org> 2010-05-31 Giuseppe Scrivano <gscrivano@gnu.org>
* css.l: Use option "nounput". * css.l: Use option "nounput".

10
src/http.c
View File

@ -2673,18 +2673,14 @@ File %s already there; not retrieving.\n\n"),
/* Reset the document type. */ /* Reset the document type. */
*dt = 0; *dt = 0;
/* Skip preliminary HEAD request if we're not in spider mode AND /* Skip preliminary HEAD request if we're not in spider mode. */
* if -O was given or HTTP Content-Disposition support is disabled. */ if (!opt.spider)
if (!opt.spider
&& (got_name || !opt.content_disposition))
send_head_first = false; send_head_first = false;
/* Send preliminary HEAD request if -N is given and we have an existing /* Send preliminary HEAD request if -N is given and we have an existing
* destination file. */ * destination file. */
file_name = url_file_name (u); file_name = url_file_name (u);
if (opt.timestamping if (opt.timestamping && file_exists_p (file_name))
&& !opt.content_disposition
&& file_exists_p (file_name))
send_head_first = true; send_head_first = true;
xfree (file_name); xfree (file_name);