From: Micah Cowan <micah@cowan.name>
Date: Tue, 2 Dec 2008 06:59:03 +0000 (-0800)
Subject: Not-so-automated merge.
X-Git-Tag: v1.13~372
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=58de6f00335b5be480469503560dc424ea91e1cf

Not-so-automated merge.
---

58de6f00335b5be480469503560dc424ea91e1cf
diff --cc src/ChangeLog
index 193bcd75,744ff2d2..5e7fc16d
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,10 +1,15 @@@
 +2008-11-13  Micah Cowan  <micah@cowan.name>
 +
 +	* http.c (gethttp): Don't do anything when content-length >= our
 +	requested range.
 +
+ 2008-11-27  Saint Xavier  <wget@sxav.eu>
+ 
+ 	* http.c (gethttp): Move authentication code before filename
+ 	allocation avoiding fallbacking on default filename because
+ 	"Content-Disposition" header wasn't present before authentcation
+ 	has been completed. Fixes bug #24862.
+ 
  2008-11-16  Steven Schubiger  <stsc@members.fsf.org>
  
  	* main.c: Declare and initialize the numurls counter.