Merge from mainline

[wget] / src / http.c

diff --git a/src/http.c b/src/http.c
index 0dec22358256d813841196821a498e9c3221d3fa..b664d45f639d61878c05de6b7116906351d3001f 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1,5 +1,6 @@
 /* HTTP support.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -2311,7 +2312,6 @@ http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
   const char *tmrate;
   uerr_t err, ret = TRYLIMEXC;
   time_t tmr = -1;               /* remote time-stamp */
-  wgint local_size = 0;          /* the size of the local file */
   struct http_stat hstat;        /* HTTP status */
   struct_stat st;  
   bool send_head_first = true;
@@ -2589,7 +2589,7 @@ Server file no newer than local file `%s' -- not retrieving.\n\n"),
                             {
                               logprintf (LOG_VERBOSE, _("\
 The sizes do not match (local %s) -- retrieving.\n"),
-                                         number_to_static_string (local_size));
+                                         number_to_static_string (hstat.orig_file_size));
                             }
                         }
                       else
@@ -2619,7 +2619,7 @@ Remote file exists and could contain links to other resources -- retrieving.\n\n
                     {
                       logprintf (LOG_VERBOSE, _("\
 Remote file exists but does not contain any link -- not retrieving.\n\n"));
-                      ret = RETRUNNEEDED;
+                      ret = RETROK; /* RETRUNNEEDED is not for caller. */
                       goto exit;
                     }
                 }
@@ -2627,7 +2627,7 @@ Remote file exists but does not contain any link -- not retrieving.\n\n"));
                 {
                   logprintf (LOG_VERBOSE, _("\
 Remote file exists but recursion is disabled -- not retrieving.\n\n"));
-                  ret = RETRUNNEEDED;
+                  ret = RETROK; /* RETRUNNEEDED is not for caller. */
                   goto exit;
                 }
             }