moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

remove unused ftps-server code and fixed two warnings

Browse Source
This commit is contained in:
Daniel Stenberg 2005-04-28 08:23:25 +00:00
parent 9fb253388b
commit 50fe7b5e35
1 changed files with 14 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
tests/runtests.pl
View File

@ -156,6 +156,15 @@ chomp($pwd = `pwd`);
$ENV{'CURL_MEMDEBUG'} = $memdump; $ENV{'CURL_MEMDEBUG'} = $memdump;
$ENV{'HOME'}=$pwd; $ENV{'HOME'}=$pwd;
sub catch_zap {
my $signame = shift;
print STDERR "received SIG$signame, exiting\n";
stopservers();
die "Somebody sent me a SIG$signame";
}
$SIG{INT} = \&catch_zap;
$SIG{KILL} = \&catch_zap;
########################################################################## ##########################################################################
# Clear all possible '*_proxy' environment variables for various protocols # Clear all possible '*_proxy' environment variables for various protocols
# to prevent them to interfere with our testing! # to prevent them to interfere with our testing!
@ -629,53 +638,6 @@ sub runftpserver {
return $pid; return $pid;
} }
#######################################################################
# start the ftps server (or rather, tunnel) if needed
#
sub runftpsserver {
my $verbose = $_[0];
my $STATUS;
my $RUNNING;
if(!$stunnel) {
return 0;
}
my $pid=checkserver($FTPSPIDFILE );
if($pid > 0) {
# kill previous stunnel!
if($verbose) {
print "kills off running stunnel at $pid\n";
}
stopserver($FTPSPIDFILE);
}
my $flag=$debugprotocol?"-v ":"";
my $cmd="$perl $srcdir/ftpsserver.pl $flag -s \"$stunnel\" -d $srcdir -r $FTPPORT $FTPSPORT &";
system($cmd);
if($verbose) {
print "CMD: $cmd\n";
}
sleep(1);
for(1 .. 30) {
$pid=checkserver($FTPSPIDFILE );
if($pid <= 0) {
if($verbose) {
print STDERR "RUN: waiting one sec for FTPS server\n";
}
sleep(1);
}
else {
last;
}
}
return $pid;
}
####################################################################### #######################################################################
# Remove all files in the specified directory # Remove all files in the specified directory
# #
@ -890,7 +852,7 @@ sub checkcurl {
} }
# check if the FTP server has it! # check if the FTP server has it!
my @sws = `server/sockfilt --version`; @sws = `server/sockfilt --version`;
if($sws[0] =~ /IPv6/) { if($sws[0] =~ /IPv6/) {
# FTP server has ipv6 support! # FTP server has ipv6 support!
$ftp_ipv6 = 1; $ftp_ipv6 = 1;
@ -922,7 +884,7 @@ sub checkcurl {
printf("* FTP port: %d\n", $FTPPORT); printf("* FTP port: %d\n", $FTPPORT);
printf("* FTP port 2: %d\n", $FTP2PORT); printf("* FTP port 2: %d\n", $FTP2PORT);
if($stunnel) { if($stunnel) {
printf("* FTPS port: %d\n", $FTPSPORT); #printf("* FTPS port: %d\n", $FTPSPORT);
printf("* HTTPS port: %d\n", $HTTPSPORT); printf("* HTTPS port: %d\n", $HTTPSPORT);
} }
if($http_ipv6) { if($http_ipv6) {
@ -1475,7 +1437,6 @@ sub singletest {
# accept multiple comma-separated error codes # accept multiple comma-separated error codes
my @splerr = split(/ *, */, $errorcode); my @splerr = split(/ *, */, $errorcode);
my $errok; my $errok;
my $e;
foreach $e (@splerr) { foreach $e (@splerr) {
if($e == $cmdres) { if($e == $cmdres) {
# a fine error code # a fine error code
@ -1485,9 +1446,6 @@ sub singletest {
} }
if($errok) { if($errok) {
if($verbose) {
print " received exitcode $cmdres OK";
}
$ok .= "e"; $ok .= "e";
} }
else { else {
@ -1673,32 +1631,8 @@ sub startservers {
} }
} }
elsif($what eq "ftps") { elsif($what eq "ftps") {
if(!$stunnel) { # we can't run ftps tests at all for the moment
# we can't run ftps tests without stunnel return "test suite lacks FTPS support";
return "no stunnel";
}
if(!$ssl_version) {
# we can't run ftps tests if libcurl is SSL-less
return "curl lacks SSL support";
}
if(!$run{'ftp'}) {
$pid = runftpserver("", $verbose);
if($pid <= 0) {
return "failed starting FTP server";
}
printf ("* pid ftp => %-5d\n", $pid) if($verbose);
$run{'ftp'}=$pid;
}
if(!$run{'ftps'}) {
return 2;
$pid = runftpsserver($verbose);
if($pid <= 0) {
return "failed starting FTPS server (stunnel)";
}
printf ("* pid ftps => %-5d\n", $pid) if($verbose);
$run{'ftps'}=$pid;
}
} }
elsif($what eq "file") { elsif($what eq "file") {
# we support it but have no server! # we support it but have no server!
@ -1978,7 +1912,7 @@ my $ok=0;
my $total=0; my $total=0;
my $lasttest; my $lasttest;
my @at = split(" ", $TESTCASES); my @at = split(" ", $TESTCASES);
my $count; my $count=0;
$start = time(); $start = time();