From: Micah Cowan <micah@cowan.name>
Date: Thu, 28 Aug 2008 08:21:59 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~338^2~7
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=090f1596ae2eb446c265a62849f59657a9ee9e07;hp=26a3eea8e2f42c621ce6c40a93acf5ff1cd12220

Automated merge.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index edbb592e..ab830ba0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,6 +55,12 @@ EXTRA_wget_SOURCES = mswindows.c
 LDADD = $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@
 AM_CPPFLAGS = -I$(top_srcdir)/lib @MD5_CPPFLAGS@
 
+../lib/libgnu.a:
+	cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
+
+../md5/libmd5.a:
+	cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
+
 ESCAPEQUOTE = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
 version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
 	echo '/* version.c */' > $@
diff --git a/tests/HTTPServer.pm b/tests/HTTPServer.pm
index dbfa3ef1..b76f0985 100644
--- a/tests/HTTPServer.pm
+++ b/tests/HTTPServer.pm
@@ -92,13 +92,13 @@ sub send_response {
             print $con $content;
             next;
         }
-        if ($req->header("Range")) {
+        if ($req->header("Range") && !$url_rec->{'force_code'}) {
             $req->header("Range") =~ m/bytes=(\d*)-(\d*)/;
             my $content_len = length($content);
             my $start = $1 ? $1 : 0;
             my $end = $2 ? $2 : ($content_len - 1);
             my $len = $2 ? ($2 - $start) : ($content_len - $start);
-            if ($len) {
+            if ($len > 0) {
                 $resp->header("Accept-Ranges" => "bytes");
                 $resp->header("Content-Length" => $len);
                 $resp->header("Content-Range"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 27f9adaa..6e703f01 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,10 +42,19 @@ test: ../src/wget$(EXEEXT) run-unit-tests run-px-tests
 ../src/wget$(EXEEXT):
 	cd ../src && $(MAKE) $(AM_MAKEFLAGS)
 
+../src/libunittest.a:
+	cd ../src && $(MAKE) $(AM_MAKEFLAGS) libunittest.a
+
+../lib/libgnu.a:
+	cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
+
+../md5/libmd5.a:
+	cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
+
 run-unit-tests: unit-tests$(EXEEXT)
 	./unit-tests$(EXEEXT)
 
-run-px-tests: WgetTest.pm
+run-px-tests: WgetTest.pm ../src/wget$(EXEEXT)
 	./run-px $(top_srcdir)
 
 EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
@@ -62,6 +71,7 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
 
 check_PROGRAMS = unit-tests
 unit_tests_SOURCES = 
+#unit-tests: ../src/libunittest.a ../lib/libgnu.a
 LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \
         @MD5_LDADD@
 
diff --git a/tests/Test-O-nc.px b/tests/Test-O-nc.px
new file mode 100755
index 00000000..08819e4b
--- /dev/null
+++ b/tests/Test-O-nc.px
@@ -0,0 +1,46 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+use HTTPTest;
+
+
+###############################################################################
+
+my $dummyfile = <<EOF;
+Don't care.
+EOF
+
+# code, msg, headers, content
+my %urls = (
+    '/dummy.txt' => {
+        code => "200",
+        msg => "Dontcare",
+        headers => {
+            "Content-type" => "text/plain",
+        },
+        content => $dummyfile
+    },
+);
+
+my $cmdline = $WgetTest::WGETPATH . " -nc -O out http://localhost:{{port}}/dummy.txt";
+
+my $expected_error_code = 0;
+
+my %expected_downloaded_files = (
+    'out' => {
+        content => $dummyfile,
+    }
+);
+
+###############################################################################
+
+my $the_test = HTTPTest->new (name => "Test-O-nc",
+                              input => \%urls, 
+                              cmdline => $cmdline, 
+                              errcode => $expected_error_code, 
+                              output => \%expected_downloaded_files);
+exit $the_test->run();
+
+# vim: et ts=4 sw=4
+
diff --git a/tests/Test-c-shorter.px b/tests/Test-c-shorter.px
new file mode 100755
index 00000000..432cab92
--- /dev/null
+++ b/tests/Test-c-shorter.px
@@ -0,0 +1,64 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+use HTTPTest;
+
+
+###############################################################################
+
+my $partiallydownloaded = <<EOF;
+11111111111111111111111111111111111111111111111111
+22222222x222222222222222222222222222222222222222222222222222
+EOF
+
+my $rest = <<EOF;
+3333333333333333333333333333333333333333333333333333333333333333333333
+444444444444444444444444444444444444444444444444444444444444
+55555555555555555555555555555555555555555555555555
+EOF
+
+my $downloadedfile = $partiallydownloaded . $rest;
+
+# code, msg, headers, content
+my %urls = (
+    '/somefile.txt' => {
+        code => "200",
+        force_code => 1,
+        msg => "Dontcare",
+        headers => {
+            "Content-type" => "text/plain",
+            "Content-Length" => 0,
+        },
+        content => '',
+    },
+);
+
+my $cmdline = $WgetTest::WGETPATH . " -c http://localhost:{{port}}/somefile.txt";
+
+my $expected_error_code = 0;
+
+my %existing_files = (
+    'somefile.txt' => {
+        content => $downloadedfile,
+    },
+);
+
+my %expected_downloaded_files = (
+    'somefile.txt' => {
+        content => $downloadedfile,
+    },
+);
+
+###############################################################################
+
+my $the_test = HTTPTest->new (name => "Test-c-partial",
+                              input => \%urls, 
+                              cmdline => $cmdline, 
+                              errcode => $expected_error_code, 
+                              existing => \%existing_files,
+                              output => \%expected_downloaded_files);
+exit $the_test->run();
+
+# vim: et ts=4 sw=4
+
diff --git a/tests/run-px b/tests/run-px
index 51dec828..c18c8d85 100755
--- a/tests/run-px
+++ b/tests/run-px
@@ -12,6 +12,7 @@ my @tests = (
     'Test--spider.px',
     'Test-c-full.px',
     'Test-c-partial.px',
+    'Test-c-shorter.px',
     'Test-c.px',
     'Test-E-k-K.px',
     'Test-E-k.px',
@@ -43,6 +44,7 @@ my @tests = (
     'Test-O--no-content-disposition-trivial.px',
     'Test-O-nonexisting.px',
     'Test-O.px',
+    'Test-O-nc.px',
     'Test-Restrict-Lowercase.px',
     'Test-Restrict-Uppercase.px',
     'Test--spider-fail.px',