Automated merge with file:/home/micah/devel/wget/fix-double-gets

diff --combined src/ChangeLog
index 6b7426006cce497f45733dd746a97d588abe0e98,6864760e1496df4447ca995b7b7c44b913cf6cd0..f3b0e539d18d3f889a9a22ac2ce6732b25944c00
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,10 -1,10 +1,10 @@@
 -2007-10-02  Gisle Vanem  <gvanem@broadpark.no>
 -      
 -      * ftp.c: Use "_listing" for MSDOS (".listing" is illegal).
 +2007-10-08  Micah Cowan  <micah@cowan.name>
  
 -      * url.c: Update comment for 'filechr_not_windows'.
 -
 -      * utils.c: Include <process.h> for 'getpid()' on Watcom.
 +      * http.c (http_loop): Add send_head_first conditional back
 +      around code that needs it, but not around the last-modified
 +      header-parsing stuff this time. Removed no-longer-useful (was it
 +      ever?) restart_loop boolean, continuing unconditionally at end
 +      of send_head_first conditional block (if we haven't jumped out).
  
  2007-10-04  Micah Cowan  <micah@cowan.name>
  
@@@ -12,6 -12,6 +12,14 @@@
        support isn't on; make sure we continue properly in that case,
        even though we're not sending HEAD.
  
++2007-10-02  Gisle Vanem  <gvanem@broadpark.no>
++      
++      * ftp.c: Use "_listing" for MSDOS (".listing" is illegal).
++
++      * url.c: Update comment for 'filechr_not_windows'.
++
++      * utils.c: Include <process.h> for 'getpid()' on Watcom.
++
  2007-10-02  Micah Cowan  <micah@cowan.name>
  
        * ftp.c (getftp, ftp_loop_internal), http.c (http_loop), main