1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

Merging in the rest of Alex's bundle.

This commit is contained in:
Micah Cowan 2008-04-12 12:57:25 -07:00
commit 4e288c5db5
7 changed files with 73 additions and 2 deletions

View File

@ -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> 2008-03-24 Micah Cowan <micah@cowan.name>
* wget.texi <Types of Fields>: Mentioned various caveats in the * wget.texi <Types of Fields>: Mentioned various caveats in the

View File

@ -3770,6 +3770,7 @@ Paul Bludov,
Daniel Bodea, Daniel Bodea,
Mark Boyns, Mark Boyns,
John Burden, John Burden,
Julien Buty,
Wanderlei Cavassin, Wanderlei Cavassin,
Gilles Cedoc, Gilles Cedoc,
Tim Charron, Tim Charron,
@ -3785,6 +3786,7 @@ Andreas Damm,
Ahmon Dancy, Ahmon Dancy,
Andrew Davison, Andrew Davison,
Bertrand Demiddelaer, Bertrand Demiddelaer,
Alexander Dergachev,
Andrew Deryabin, Andrew Deryabin,
Ulrich Drepper, Ulrich Drepper,
Marc Duponcheel, Marc Duponcheel,
@ -3938,6 +3940,7 @@ Philipp Thomas,
Mauro Tortonesi, Mauro Tortonesi,
Dave Turner, Dave Turner,
Gisle Vanem, Gisle Vanem,
Rabin Vincent,
Russell Vincent, Russell Vincent,
@iftex @iftex
@v{Z}eljko Vrba, @v{Z}eljko Vrba,

View File

@ -3,6 +3,13 @@
* utils.c (aprintf): Now we are setting limits (1 Mb) for text * utils.c (aprintf): Now we are setting limits (1 Mb) for text
buffer when we use non-C99 vsnprintf. 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> 2008-04-10 Alexander Dergachev <cy6erbr4in@gmail.com>
* xmalloc.c, xmalloc.h (memfatal): Now exported; accepts an * xmalloc.c, xmalloc.h (memfatal): Now exported; accepts an

View File

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

View File

@ -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> 2008-01-25 Micah Cowan <micah@cowan.name>
* Makefile.am: Updated copyright year. * Makefile.am: Updated copyright year.

View File

@ -46,6 +46,7 @@ run-unit-tests: unit-tests$(EXEEXT)
./unit-tests$(EXEEXT) ./unit-tests$(EXEEXT)
run-px-tests: WgetTest.pm 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-auth-basic.px && echo && echo
$(PERLRUN) $(srcdir)/Test-c-full.px && echo && echo $(PERLRUN) $(srcdir)/Test-c-full.px && echo && echo
$(PERLRUN) $(srcdir)/Test-c-partial.px && echo && echo $(PERLRUN) $(srcdir)/Test-c-partial.px && echo && echo

48
tests/Test-proxy-auth-basic.px Executable file
View File

@ -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