Merging with previous Makefile.in updates.

[wget] / src / http.c

diff --git a/src/http.c b/src/http.c
index 11af939a170fc20d073795988b13ef717d0a1b5b..b82abdda4109329cd18b112bc91a2a99513859fe 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -2344,6 +2344,11 @@ http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
       hstat.local_file = xstrdup (opt.output_document);
       got_name = true;
     }
+  else if (!opt.content_disposition)
+    {
+      hstat.local_file = url_file_name (u);
+      got_name = true;
+    }
 
   /* Reset the counter. */
   count = 0;
@@ -2538,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;