[svn] Backing out incomplete changes for bug 20323, until the full fix is

ready (so we have a working trunk).

diff --git a/src/ChangeLog b/src/ChangeLog
index 6b562001a9e46d0ee21a573f00918ffd8da33ddb..e1065eeeb0316f8074181f66348dcc7052ed4ff5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -15,11 +15,6 @@
        Updated GPL reference to version 3 or later, removed FSF
        address.
 
-2007-07-04  Mauro Tortonesi  <mauro@ferrara.linux.it>
-
-       * http.c (http_loop): Skip HEAD request and start immediately with GET
-       if -O is given.
-
 2007-02-02  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * http.c (print_server_response): Escape non-printable characters

diff --git a/src/http.c b/src/http.c
index faeb0e7fd345cbe94826445e27f9fe18bff819f4..4813460f61baf36527a78083ddf36ea6e0c120eb 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -2342,7 +2342,8 @@ Spider mode enabled. Check if remote file exists.\n"));
       /* Default document type is empty.  However, if spider mode is
          on or time-stamping is employed, HEAD_ONLY commands is
          encoded within *dt.  */
-      if (((opt.spider || opt.timestamping) && !got_head) || !got_name)
+      if (((opt.spider || opt.timestamping) && !got_head)
+          || (opt.always_rest && !got_name))
         *dt |= HEAD_ONLY;
       else
         *dt &= ~HEAD_ONLY;