From: Micah Cowan <micah@cowan.name>
Date: Tue, 9 Oct 2007 18:17:26 +0000 (-0700)
Subject: Automated merge with file:/home/micah/devel/wget/eleven
X-Git-Tag: v1.13~516^2~10
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=f2956990ca0ec026c3b7702ec1d7afbd6f9dacf9

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

f2956990ca0ec026c3b7702ec1d7afbd6f9dacf9
diff --cc src/ChangeLog
index 322d5bdb,f3b0e539..000b68ab
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,18 -1,25 +1,34 @@@
 +2007-10-09  Micah Cowan  <micah@cowan.name>
 +
 +	* gettext.h: Imported from /usr/share/gettext, fuller handling
 +	of --disable-nls.
 +	* wget.h: Remove logic for handling lack of NLS (now in
 +	gettext.h).
 +
+ 2007-10-08  Micah Cowan  <micah@cowan.name>
+ 
+ 	* 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>
  
  	* http.c (http_loop): We've got_name if content_disposition
  	support isn't on; make sure we continue properly in that case,
  	even though we're not sending HEAD.
 +	* Makefile.in: Removed, replaced by Makefile.am.
 +	* Makefile.am: Converted from Makefile.in.
  
+ 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