mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 15:48:49 -05:00
make ftps and https invoke both necessary servers
This commit is contained in:
parent
0f493b6038
commit
0150bff7b4
@ -613,6 +613,7 @@ sub singletest {
|
||||
}
|
||||
else {
|
||||
$CMDLINE="$LIBDIR/$tool";
|
||||
$DBGCURL=$CMDLINE;
|
||||
}
|
||||
|
||||
$CMDLINE .= "$cmdargs >$STDOUT 2>$STDERR";
|
||||
@ -829,13 +830,11 @@ sub serverfortest {
|
||||
push @what, "file";
|
||||
}
|
||||
elsif($testnum< 400) {
|
||||
# 300 - 399 is for HTTPS, two servers!
|
||||
push @what, "http";
|
||||
# 300 - 399 is for HTTPS
|
||||
push @what, "https";
|
||||
}
|
||||
elsif($testnum< 500) {
|
||||
# 400 - 499 is for FTPS, also two servers
|
||||
push @what, "ftp";
|
||||
# 400 - 499 is for FTPS
|
||||
push @what, "ftps";
|
||||
}
|
||||
|
||||
@ -876,6 +875,10 @@ sub serverfortest {
|
||||
# or if libcurl is SSL-less
|
||||
return 1;
|
||||
}
|
||||
if(!$run{'ftp'}) {
|
||||
runftpserver($verbose);
|
||||
$run{'ftp'}=$FTPPIDFILE;
|
||||
}
|
||||
if(!$run{'ftps'}) {
|
||||
runftpsserver($verbose);
|
||||
$run{'ftps'}=$FTPSPIDFILE;
|
||||
@ -890,6 +893,10 @@ sub serverfortest {
|
||||
# or if libcurl is SSL-less
|
||||
return 1;
|
||||
}
|
||||
if(!$run{'http'}) {
|
||||
runhttpserver($verbose);
|
||||
$run{'http'}=$HTTPPIDFILE;
|
||||
}
|
||||
if(!$run{'https'}) {
|
||||
runhttpsserver($verbose);
|
||||
$run{'https'}=$HTTPSPIDFILE;
|
||||
|
Loading…
Reference in New Issue
Block a user