Allow --timestamping and --continue at the same time.

diff --git a/NEWS b/NEWS
index a4f208e3861794bd237e5c6fbfb632c75be876f8..734e366bf90664cf7cc7ad90697a5dfca72b0c52 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
 ** Now --version and --help work again.
 
 ** Fix a build error on solaris 10 sparc.
+
+** If --timestamping and --continue can be used at the same time.
+
 \f
 * Changes in Wget 1.13.3
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 4469d1df7df5ef3db4e76bfddbfe19c41d766dce..4cb3267c909a4ecde97b70f852b7ae4ec5fbfe9e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-07  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * http.c (gethttp): Don't inhibit arest request if opt.timestamping is
+       set.
+       Reported by <natrio@list.ru>
+
 2011-09-06  Jakob Matthes <jakob.matthes@gmail.com> (tiny change)
 
        * main.c (print_version): Do not exit prematurely when --help is passed.

diff --git a/src/http.c b/src/http.c
index fc88118fa773acff6ce05d459f6eecb8b77aa6dc..748b4e8142a99bf28eed6d3248fd89fb61b89241 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1626,7 +1626,7 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
       /* ... but some HTTP/1.0 caches doesn't implement Cache-Control.  */
       request_set_header (req, "Pragma", "no-cache", rel_none);
     }
-  if (hs->restval && !opt.timestamping)
+  if (hs->restval)
     request_set_header (req, "Range",
                         aprintf ("bytes=%s-",
                                  number_to_static_string (hs->restval)),