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

diff --git a/src/ChangeLog b/src/ChangeLog
index 68e34e5c313e72d53b0cc6b7c5436df7661fba81..e6e4d480851b88dd2d9a3c41a5a56bfa600f4e2a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-04  Micah Cowan  <micah@cowan.name>
+
+       * http.c (http_loop): We've got_name if content_disposition
+       support isn't on; make sure we continue properly in that case,
+       even though we're not sending HEAD.
+
 2007-10-02  Micah Cowan  <micah@cowan.name>
 
        * ftp.c (getftp, ftp_loop_internal), http.c (http_loop), main