From 88a0060b2e7f45dff0b18ac61f4695b86d840195 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 20 Dec 2009 22:08:06 +0000 Subject: revert that, we already had a function named like that! --- tests/runtests.pl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/runtests.pl') diff --git a/tests/runtests.pl b/tests/runtests.pl index 1abe2e6a8..770ffadcf 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -617,7 +617,7 @@ sub verifyhttp { # server runs fine but we cannot talk to it ("Failed to connect to ::1: Can't # assign requested address" # -sub verifyserver { +sub verifyftp { my ($proto, $ip, $port) = @_; my $pid; my $time=time(); @@ -625,7 +625,7 @@ sub verifyserver { if($proto eq "ftps") { $extra = "--insecure --ftp-ssl-control "; } - my $cmd="$VCURL --max-time $server_response_maxtime --silent --verbose --globoff $extra\"$proto://$ip:$port/verifiedserver\" 2>$LOGDIR/verifyserver"; + my $cmd="$VCURL --max-time $server_response_maxtime --silent --verbose --globoff $extra\"$proto://$ip:$port/verifiedserver\" 2>$LOGDIR/verifyftp"; # check if this is our server running on this port: my @data=runclientoutput($cmd); logmsg "RUN: $cmd\n" if($verbose); @@ -750,12 +750,12 @@ sub verifysocks { my %protofunc = ('http' => \&verifyhttp, 'https' => \&verifyhttp, - 'ftp' => \&verifyserver, - 'pop3' => \&verifyserver, - 'imap' => \&verifyserver, - 'smtp' => \&verifyserver, - 'ftps' => \&verifyserver, - 'tftp' => \&verifyserver, + 'ftp' => \&verifyftp, + 'pop3' => \&verifyftp, + 'imap' => \&verifyftp, + 'smtp' => \&verifyftp, + 'ftps' => \&verifyftp, + 'tftp' => \&verifyftp, 'ssh' => \&verifyssh, 'socks' => \&verifysocks); -- cgit v1.2.3