aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/ftpserver.pl109
1 files changed, 54 insertions, 55 deletions
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index f9031bbaa..990414b1a 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -1231,69 +1231,68 @@ sub AUTH_pop3 {
}
sub RETR_pop3 {
- my ($testno) = @_;
- my @data;
-
- if($testno =~ /^verifiedserver$/) {
- # this is the secret command that verifies that this actually is
- # the curl test server
- my $response = "WE ROOLZ: $$\r\n";
- if($verbose) {
- print STDERR "FTPD: We returned proof we are the test server\n";
- }
- $data[0] = $response;
- logmsg "return proof we are we\n";
- }
- else {
- logmsg "retrieve a mail\n";
-
- $testno =~ s/^([^0-9]*)//;
- my $testpart = "";
- if ($testno > 10000) {
- $testpart = $testno % 10000;
- $testno = int($testno / 10000);
- }
-
- # send mail content
- loadtest("$srcdir/data/test$testno");
-
- @data = getpart("reply", "data$testpart");
- }
-
- sendcontrol "+OK Mail transfer starts\r\n";
-
- for my $d (@data) {
- sendcontrol $d;
- }
-
- # end with the magic 3-byte end of mail marker, assumes that the
- # mail body ends with a CRLF!
- sendcontrol ".\r\n";
-
- return 0;
+ my ($testno) = @_;
+ my @data;
+
+ if($testno =~ /^verifiedserver$/) {
+ # this is the secret command that verifies that this actually is
+ # the curl test server
+ my $response = "WE ROOLZ: $$\r\n";
+ if($verbose) {
+ print STDERR "FTPD: We returned proof we are the test server\n";
+ }
+ $data[0] = $response;
+ logmsg "return proof we are we\n";
+ }
+ else {
+ logmsg "retrieve a mail\n";
+
+ $testno =~ s/^([^0-9]*)//;
+ my $testpart = "";
+ if ($testno > 10000) {
+ $testpart = $testno % 10000;
+ $testno = int($testno / 10000);
+ }
+
+ # send mail content
+ loadtest("$srcdir/data/test$testno");
+
+ @data = getpart("reply", "data$testpart");
+ }
+
+ sendcontrol "+OK Mail transfer starts\r\n";
+
+ for my $d (@data) {
+ sendcontrol $d;
+ }
+
+ # end with the magic 3-byte end of mail marker, assumes that the
+ # mail body ends with a CRLF!
+ sendcontrol ".\r\n";
+
+ return 0;
}
sub LIST_pop3 {
+ # This is a built-in fake-message list
+ my @data = (
+ "1 100\r\n",
+ "2 4294967400\r\n", # > 4 GB
+ "4 200\r\n", # Note that message 3 is a simulated "deleted" message
+ );
-# this is a built-in fake-message list
-my @pop3list=(
-"1 100\r\n",
-"2 4294967400\r\n", # > 4 GB
-"4 200\r\n", # Note that message 3 is a simulated "deleted" message
-);
-
- logmsg "retrieve a message list\n";
+ logmsg "retrieve a message list\n";
- sendcontrol "+OK Listing starts\r\n";
+ sendcontrol "+OK Listing starts\r\n";
- for my $d (@pop3list) {
- sendcontrol $d;
- }
+ for my $d (@data) {
+ sendcontrol $d;
+ }
- # end with the magic 3-byte end of listing marker
- sendcontrol ".\r\n";
+ # End with the magic 3-byte end of listing marker
+ sendcontrol ".\r\n";
- return 0;
+ return 0;
}
sub DELE_pop3 {