From 9a3e0e52cbb0999efb3906b67cbb94c22a37cb32 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 2 May 2005 10:03:12 +0000
Subject: fix the server for the slow response case

---
 tests/ftpserver.pl | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 3aed88b59..dd8383fa6 100644
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -585,17 +585,23 @@ sub PASV_command {
     eval {
         local $SIG{ALRM} = sub { die "alarm\n" };
 
-        alarm 5; # assume swift operations
+	# assume swift operations unless explicitly slow
+	alarm ($controldelay?20:5);
 
         # Wait for 'CNCT'
-        my $input = <DREAD>;
-
-        if($input !~ /^CNCT/) {
-            # we wait for a connected client
-            next;
-        }
-        logmsg "====> Client DATA connect\n";
-
+	my $input;
+	my $size;
+
+        while(sysread(DREAD, $input, $size)) {
+
+	    if($input !~ /^CNCT/) {
+		# we wait for a connected client
+		logmsg "Odd, we got $input from client\n";
+		next;
+	    }
+	    logmsg "====> Client DATA connect\n";
+	    last;
+	}
         alarm 0;
     };
     if ($@) {
-- 
cgit v1.2.3