Not-so-automated merge.

diff --cc src/ChangeLog
index 193bcd75ca2fe5c9955463c0c29e9ffce6f19bfe,744ff2d26556e01e1c762728a812bc73b21f819a..5e7fc16d0fad4451d0d98f1c6d09785438d061bd
--- 1/src/ChangeLog
--- 2/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.

diff --cc src/http.c
Simple merge