Test for -c shorter content (#23613).

diff --git a/tests/HTTPServer.pm b/tests/HTTPServer.pm
index dbfa3ef1ce8cea7d87c2c1d140d5634b018a60b9..b76f0985742af738c1ddb2ed3514aa1a9afd7a3e 100644 (file)
--- a/tests/HTTPServer.pm
+++ b/tests/HTTPServer.pm
@@ -92,13 +92,13 @@ sub send_response {
             print $con $content;
             next;
         }
             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);
             $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"
                 $resp->header("Accept-Ranges" => "bytes");
                 $resp->header("Content-Length" => $len);
                 $resp->header("Content-Range"

diff --git a/tests/Test-c-shorter.px b/tests/Test-c-shorter.px
new file mode 100755 (executable)
index 0000000..432cab9
--- /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 f6c8cf6e5573ffd2f2a53f81a9c8aacf0f186d80..50db5819f7b4792e7d413dbce855998af24284b9 100755 (executable)
--- 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--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',
     'Test-c.px',
     'Test-E-k-K.px',
     'Test-E-k.px',