Merging in the rest of Alex's bundle.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 343f09f73a370af2156b8150d7e08828859aeeb8..c5614d4ae2a27b5b7a8588f559237c5c7848796c 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-11  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi <Contributors>: Added Julien Buty, Alexander
+       Dergachev, and Rabin Vincent.
+
 2008-03-24  Micah Cowan  <micah@cowan.name>
 
        * wget.texi <Types of Fields>: Mentioned various caveats in the

diff --git a/doc/wget.texi b/doc/wget.texi
index cd97bcf0b9007f7a4a165f897c292bfa1f5443fc..583c7fcf2ab370df8583ab45f17d202cef2a8b98 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -3770,6 +3770,7 @@ Paul Bludov,
 Daniel Bodea,
 Mark Boyns,
 John Burden,
+Julien Buty,
 Wanderlei Cavassin,
 Gilles Cedoc,
 Tim Charron,
@@ -3785,6 +3786,7 @@ Andreas Damm,
 Ahmon Dancy,
 Andrew Davison,
 Bertrand Demiddelaer,
+Alexander Dergachev,
 Andrew Deryabin,
 Ulrich Drepper,
 Marc Duponcheel,
@@ -3938,6 +3940,7 @@ Philipp Thomas,
 Mauro Tortonesi,
 Dave Turner,
 Gisle Vanem,
+Rabin Vincent,
 Russell Vincent,
 @iftex
 @v{Z}eljko Vrba,

diff --git a/src/ChangeLog b/src/ChangeLog
index d320f1502e421d4e945678dce970245105206923..a2881858a155dea184a5b37794484047714eec2d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,13 @@
        * utils.c (aprintf): Now we are setting limits (1 Mb) for text
        buffer when we use non-C99 vsnprintf.
        
+2008-04-11  Micah Cowan  <micah@cowan.name>
+
+       * ftp.c (getftp, ftp_loop_internal): Don't append to an existing
+       .listing when --continue is used.  Fixes bug #22825. Thanks to
+       Rabin Vincent <rabin@rab.in> for pointing the way with a
+       suggested fix!
+
 2008-04-10  Alexander Dergachev  <cy6erbr4in@gmail.com>
 
        * xmalloc.c, xmalloc.h (memfatal): Now exported; accepts an

diff --git a/src/ftp.c b/src/ftp.c
index 115cc5c40d837ffd004a0a4797b16a3e94e35a5d..0321032168487d2eff9b66a13de03595b531ae4a 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -918,7 +918,7 @@ Error in server response, closing control connection.\n"));
       if (opt.backups)
         rotate_backups (con->target);
 
-      if (restval)
+      if (restval && !(con->cmd & DO_LIST))
         fp = fopen (con->target, "ab");
       else if (opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct
                || opt.output_document)
@@ -1141,7 +1141,9 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
         }
 
       /* Decide whether or not to restart.  */
-      if (opt.always_rest
+      if (con->cmd & DO_LIST)
+        restval = 0;
+      else if (opt.always_rest
           && stat (locf, &st) == 0
           && S_ISREG (st.st_mode))
         /* When -c is used, continue from on-disk size.  (Can't use

diff --git a/tests/ChangeLog b/tests/ChangeLog
index b4e49381ffc65cf9d8a59a8d3e315862466282bf..e6972b500c7fcba3b1b515cb84fa2a0ad5282eb9 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-10  Micah Cowan  <micah@cowan.name>
+
+       * Makefile.in, Test-proxy-auth-basic.px: Added a test for
+       accessing password-protected URLs through a proxy.
+
 2008-01-25  Micah Cowan  <micah@cowan.name>
 
        * Makefile.am: Updated copyright year.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 61efdd9112a1d30b2d5a0eb9e162613d71f7529c..224cb9cc56fbdb8d4c7b44c03003f5628e388be0 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,6 +46,7 @@ run-unit-tests: unit-tests$(EXEEXT)
        ./unit-tests$(EXEEXT)
 
 run-px-tests: WgetTest.pm
+       $(PERLRUN) $(srcdir)/Test-proxy-auth-basic.px && echo && echo
        $(PERLRUN) $(srcdir)/Test-auth-basic.px && echo && echo
        $(PERLRUN) $(srcdir)/Test-c-full.px && echo && echo
        $(PERLRUN) $(srcdir)/Test-c-partial.px && echo && echo

diff --git a/tests/Test-proxy-auth-basic.px b/tests/Test-proxy-auth-basic.px
new file mode 100755 (executable)
index 0000000..5566e22
--- /dev/null
+++ b/tests/Test-proxy-auth-basic.px
@@ -0,0 +1,48 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+use HTTPTest;
+
+
+###############################################################################
+
+my $wholefile = "You're all authenticated.\n";
+
+# code, msg, headers, content
+my %urls = (
+    '/needs-auth.txt' => {
+        auth_method => 'Basic',
+        user => 'fiddle-dee-dee',
+        passwd => 'Dodgson',
+        code => "200",
+        msg => "You want fries with that?",
+        headers => {
+            "Content-type" => "text/plain",
+        },
+        content => $wholefile,
+    },
+);
+
+my $cmdline = $WgetTest::WGETPATH . " --debug --user=fiddle-dee-dee --password=Dodgson"
+    . " -e http_proxy=localhost:8080 http://no.such.domain/needs-auth.txt";
+
+my $expected_error_code = 0;
+
+my %expected_downloaded_files = (
+    'needs-auth.txt' => {
+        content => $wholefile,
+    },
+);
+
+###############################################################################
+
+my $the_test = HTTPTest->new (name => "Test-auth-basic",
+                              input => \%urls, 
+                              cmdline => $cmdline, 
+                              errcode => $expected_error_code, 
+                              output => \%expected_downloaded_files);
+exit $the_test->run();
+
+# vim: et ts=4 sw=4
+