From bd5527dad41a2626a6e8452bee36c76fba941f48 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 3 Jun 2010 16:46:56 +0200 Subject: [PATCH] If --content-disposition is used, do not send a HEAD request. --- NEWS | 3 +++ src/ChangeLog | 6 ++++++ src/http.c | 10 +++------- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index e04f27be..d0026378 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,9 @@ Please send GNU Wget bug reports to . ** Cope better with unclosed html tags. ** 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 diff --git a/src/ChangeLog b/src/ChangeLog index 449d24d7..edf95139 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-06-03 Giuseppe Scrivano + + * 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 * css.l: Use option "nounput". diff --git a/src/http.c b/src/http.c index 0dfce018..577781cc 100644 --- a/src/http.c +++ b/src/http.c @@ -2673,18 +2673,14 @@ File %s already there; not retrieving.\n\n"), /* Reset the document type. */ *dt = 0; - /* Skip preliminary HEAD request if we're not in spider mode AND - * if -O was given or HTTP Content-Disposition support is disabled. */ - if (!opt.spider - && (got_name || !opt.content_disposition)) + /* Skip preliminary HEAD request if we're not in spider mode. */ + if (!opt.spider) send_head_first = false; /* Send preliminary HEAD request if -N is given and we have an existing * destination file. */ file_name = url_file_name (u); - if (opt.timestamping - && !opt.content_disposition - && file_exists_p (file_name)) + if (opt.timestamping && file_exists_p (file_name)) send_head_first = true; xfree (file_name);