Automated merge with file:/home/micah/devel/wget/eleven

diff --combined src/ChangeLog
index 495becdc5804d08df154e031e03e1539d9358009,c6fc6564c1ae7dd5570d5603b99b5a38d17e8689..68e34e5c313e72d53b0cc6b7c5436df7661fba81
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,31 +1,36 @@@
+ 2007-10-02  Micah Cowan  <micah@cowan.name>
+ 
+       * ftp.c (getftp, ftp_loop_internal), http.c (http_loop), main
+       (main): Use datetime_str instead of time_str, for those who have
+       potentially long-running sessions. Based on suggestions by Saso
+       Tomat <miskox@hotmail.com> and Steven M. Schweda
+       <sms@antinode.org>.
+       * http.c (gethttp): Warn about host lookup failures. Adjusted
+       from Stephen Gildea's patch.
+ 
+ 2007-10-02  Stephen Gildea  <stepheng+wget@gildea.com>
+ 
+       * connect.c (connect_to_host): Warn about host lookup failures.
+ 
+ 2007-09-25  Micah Cowan  <micah@cowan.name>
+ 
+       * Makefile.in: Use EXEEXT instead of exeext.
+ 
+ 2007-09-24  Gisle Vanem  <giva@bgnett.no>
+ 
+       * connect.c, init.c, main.c, openssl.c, options.h, sysdep.h,
+       url.c, utils.c: Added support for building on MS-DOS.
+ 
+ 2007-09-24  Jochen Roderburg  <roderburg@uni-koeln.de>
+ 
+       * 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 --combined src/http.c
index b7ca4b51b0693e0bbbfe2f41f5b0b6ccc781d1f5,d723a3105ba1e45f6b0e5ea22c60f0c8cc424b16..b82abdda4109329cd18b112bc91a2a99513859fe
--- 1/src/http.c
--- 2/src/http.c
+++ b/src/http.c
@@@ -1,5 -1,6 +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.
  
@@@ -1621,19 -1622,18 +1622,18 @@@ gethttp (struct url *u, struct http_sta
                 only hurts us.  */
              request_remove_header (req, "Authorization");
          }
-     }
- 
-   if (sock < 0)
-     {
-       /* In its current implementation, persistent_available_p will
-          look up conn->host in some cases.  If that lookup failed, we
-          don't need to bother with connect_to_host.  */
-       if (host_lookup_failed)
+       else if (host_lookup_failed)
          {
            request_free (req);
+           logprintf(LOG_NOTQUIET,
+                     _("%s: unable to resolve host address `%s'\n"),
+                     exec_name, relevant->host);
            return HOSTERR;
          }
+     }
  
+   if (sock < 0)
+     {
        sock = connect_to_host (conn->host, conn->port);
        if (sock == E_HOST)
          {
@@@ -1820,7 -1820,7 +1820,7 @@@ File `%s' already there; not retrieving
            if (has_html_suffix_p (hs->local_file))
              *dt |= TEXTHTML;
  
-           return RETROK;
+           return RETRUNNEEDED;
          }
        else if (!ALLOW_CLOBBER)
          {
@@@ -2311,7 -2311,6 +2311,6 @@@ http_loop (struct url *u, char **newloc
    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;
@@@ -2345,6 -2344,11 +2344,11 @@@
        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;
@@@ -2373,7 -2377,7 +2377,7 @@@
        sleep_between_retrievals (count);
        
        /* Get the current time string.  */
-       tms = time_str (time (NULL));
+       tms = datetime_str (time (NULL));
        
        if (opt.spider && !got_head)
          logprintf (LOG_VERBOSE, _("\
@@@ -2442,7 -2446,7 +2446,7 @@@ Spider mode enabled. Check if remote fi
        err = gethttp (u, &hstat, dt, proxy);
  
        /* Time?  */
-       tms = time_str (time (NULL));
+       tms = datetime_str (time (NULL));
        
        /* Get the new location (with or without the redirection).  */
        if (hstat.newloc)
@@@ -2539,7 -2543,7 +2543,7 @@@ Remote file does not exist -- broken li
          }
  
        /* Did we get the time-stamp? */
 -      if (send_head_first && !got_head)
 +      if (!got_head)
          {
            bool restart_loop = false;
  
@@@ -2589,7 -2593,7 +2593,7 @@@ Server file no newer than local file `%
                              {
                                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