moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

1. no longer ask the server for the HTTPS pid, as it returns the HTTP pid

Browse Source 
(problem identified by Dan F)
2. initial text mode fix for file checks, to allow better text file testing
on windows (with regard to line endings)
3. fixed to use the proper ftpserver pidfile to find pid
This commit is contained in:
Daniel Stenberg 2005-04-28 06:50:42 +00:00
parent 78882e4642
commit 51b17b299c
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/runtests.pl
View File

@ -469,7 +469,7 @@ sub runhttpsserver {
return 0; return 0;
} }
my $pid=checkserver($HTTPSPIDFILE ); my $pid=checkserver($HTTPSPIDFILE);
if($pid > 0) { if($pid > 0) {
# kill previous stunnel! # kill previous stunnel!
@ -496,7 +496,13 @@ sub runhttpsserver {
my $data=`$cmd`; my $data=`$cmd`;
if ( $data =~ /WE ROOLZ: (\d+)/ ) { if ( $data =~ /WE ROOLZ: (\d+)/ ) {
$pid = 0+$1; # The replying server is the HTTP (_not_ HTTPS) server, so the
# pid it returns is of course not the pid we want here. We extract
# the pid from the fresh pid file instead.
$pid=checkserver($HTTPSPIDFILE);
if($verbose) {
print STDERR "RUN: extracted pid $pid from $HTTPSPIDFILE\n";
}
last; last;
} }
if($verbose) { if($verbose) {
@ -532,7 +538,7 @@ sub runftpserver {
$nameext="-ipv6"; $nameext="-ipv6";
} }
my $pid = checkserver (); my $pid = checkserver($pidfile);
if ($pid <= 0) { if ($pid <= 0) {
print "RUN: Check port $port for the FTP$id$nameext server\n" print "RUN: Check port $port for the FTP$id$nameext server\n"
@ -1434,10 +1440,19 @@ sub singletest {
print "ERROR: section verify=>file has no name attribute!\n"; print "ERROR: section verify=>file has no name attribute!\n";
exit; exit;
} }
my $filemode=$hash{'mode'};
my @generated=loadarray($filename); my @generated=loadarray($filename);
# what parts to cut off from the file # what parts to cut off from the file
my @stripfile = getpart("verify", "stripfile"); my @stripfile = getpart("verify", "stripfile");
if(($filemode eq "text") && ($^O eq 'MSWin32')) {
# text mode when running on windows means adding an extra
# strip expression
push @stripfile, "s/\r\n/\n/";
}
my $strip; my $strip;
for $strip (@stripfile) { for $strip (@stripfile) {
chomp $strip; chomp $strip;