Commit 88a0060b authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

revert that, we already had a function named like that!

parent 4adf7d62
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -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);