test case 126 added, this uses RETRWEIRDO that makes the FTP server send two

responses at once, to excerise the part of curl to make sure it can cache
(parts of) responses properly.

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 71e0a60f51f5076b8afe3ef6cedfba0245e51bd9..575c1ecb9be2322e0a5c4ef3633eb55f5c15b4d6 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -14,4 +14,4 @@ test103  test112  test121  test17   test22   test300  test401  test8 \
 test104  test113  test122  test18   test23   test301  test402  test9 \
 test105  test114  test123  test19   test24   test302  test43   \
 test106  test115  test124  test190  test25   test303  test44   \
-test107  test116  test125  test2    test26   test33   test45   
+test107  test116  test125  test2    test26   test33   test45   test126

diff --git a/tests/data/test126 b/tests/data/test126
new file mode 100644 (file)
index 0000000..55abb5a
--- /dev/null
+++ b/tests/data/test126
@@ -0,0 +1,33 @@
+# Server-side
+<reply>
+<data>
+this is file contents
+</data>
+</reply>
+
+# Client-side
+<client>
+ <name>
+FTP download with multiple replies at once in RETR
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/blalbla/lululul/126
+</command>
+<file name="log/ftpserver.cmd">
+RETRWEIRDO
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous\r
+PASS curl_by_daniel@haxx.se\r
+PWD\r
+CWD blalbla/lululul\r
+EPSV\r
+TYPE I\r
+SIZE 126\r
+RETR 126\r
+</protocol>
+</verify>

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index beae5fa14356c47d7a47079f0ef52fa8e5adb81b..c0094b3a97e416312804e7fd4f37407fea94916a 100644 (file)
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -26,6 +26,7 @@ sub logmsg { print FTPLOG "$$: "; print FTPLOG @_; }
 sub ftpmsg { print INPUT @_; }
 
 my $verbose=0; # set to 1 for debugging
+my $retrweirdo=0;
 
 my $port = 8921; # just a default
 do {
@@ -226,16 +227,30 @@ sub RETR_command {
             logmsg "REST $rest was removed from size, makes $size left\n";
             $rest = 0; # reset REST offset again
         }
-        print "150 Binary data connection for $testno () ($size bytes).\r\n";
-        logmsg "150 Binary data connection for $testno ($size bytes).\n";
-
-        for(@data) {
-            my $send = $_;
-            print SOCK $send;
+        if($retrweirdo) {
+            print "150 Binary data connection for $testno () ($size bytes).\r\n",
+            "226 File transfer complete\r\n";
+            logmsg "150+226 in one shot!\n";
+
+            for(@data) {
+                my $send = $_;
+                print SOCK $send;
+            }
+            close(SOCK);
+            $retrweirdo=0; # switch off the weirdo again!
         }
-        close(SOCK);
+        else {
+            print "150 Binary data connection for $testno () ($size bytes).\r\n";
+            logmsg "150 Binary data connection for $testno ($size bytes).\n";
 
-        print "226 File transfer complete\r\n";
+            for(@data) {
+                my $send = $_;
+                print SOCK $send;
+            }
+            close(SOCK);
+
+            print "226 File transfer complete\r\n";
+        }
     }
     else {
         print "550 $testno: No such file or directory.\r\n";
@@ -367,6 +382,10 @@ sub customize {
         elsif($_ =~ /DELAY ([A-Z]+) (\d*)/) {
             $delayreply{$1}=$2;
         }
+        elsif($_ =~ /RETRWEIRDO/) {
+            print "instructed to use RETRWEIRDO\n";
+            $retrweirdo=1;
+        }
     }
     close(CUSTOM);
 }