Automated merge with file:/home/micah/devel/wget/timestamp-on-get

diff --git a/src/ChangeLog b/src/ChangeLog
index d6657e175daf957bc9c15d3a4186e5759e1c9a71..e6e4d480851b88dd2d9a3c41a5a56bfa600f4e2a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -32,6 +32,11 @@
        * http.c (http_zero): Remove no-longer-used local_size variable.
        Fixes bug #21057.
 
+2007-09-12  Micah Cowan  <micah@cowan.name>
+
+       * http.c (http_loop): Remove send_head_first from condition for
+       parsing timestamp.
+
 2007-08-29  Micah Cowan  <micah@cowan.name>
 
        * openssl.c (ssl_init): Re un-const-ified the meth local

diff --git a/src/http.c b/src/http.c
index d723a3105ba1e45f6b0e5ea22c60f0c8cc424b16..b82abdda4109329cd18b112bc91a2a99513859fe 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -2543,7 +2543,7 @@ Remote file does not exist -- broken link!!!\n"));
         }
 
       /* Did we get the time-stamp? */
-      if (send_head_first && !got_head)
+      if (!got_head)
         {
           bool restart_loop = false;