mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-21 01:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clear out FTP server options before each new client.

Browse Source 
Wait for child processes to die to avoid creating zombies.
This commit is contained in:
Dan Fandrich 2007-04-24 21:30:39 +00:00
parent bc1ae973da
commit 17507eac85
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/ftp.pm
View File

@ -64,6 +64,7 @@ sub ftpkillslave {
if($pid > 0) { if($pid > 0) {
printf ("* kill pid for %s => %d\n", "ftp-$base$id$ext", $pid) if($verbose); printf ("* kill pid for %s => %d\n", "ftp-$base$id$ext", $pid) if($verbose);
kill (9, $pid); # die! kill (9, $pid); # die!
waitpid($pid, 0);
} }
unlink($f); unlink($f);
} }

12
tests/ftpserver.pl
View File

@ -139,6 +139,7 @@ sub sysread_or_die {
logmsg "Failed to read input\n"; logmsg "Failed to read input\n";
logmsg "Error: ftp$ftpdnum$ext sysread error: $!\n"; logmsg "Error: ftp$ftpdnum$ext sysread error: $!\n";
kill(9, $sfpid); kill(9, $sfpid);
waitpid($sfpid, 0);
die "Died in sysread_or_die() at $fcaller " . die "Died in sysread_or_die() at $fcaller " .
"line $lcaller. ftp$ftpdnum$ext sysread error: $!\n"; "line $lcaller. ftp$ftpdnum$ext sysread error: $!\n";
} }
@ -147,6 +148,7 @@ sub sysread_or_die {
logmsg "Failed to read input\n"; logmsg "Failed to read input\n";
logmsg "Error: ftp$ftpdnum$ext read zero\n"; logmsg "Error: ftp$ftpdnum$ext read zero\n";
kill(9, $sfpid); kill(9, $sfpid);
waitpid($sfpid, 0);
die "Died in sysread_or_die() at $fcaller " . die "Died in sysread_or_die() at $fcaller " .
"line $lcaller. ftp$ftpdnum$ext read zero\n"; "line $lcaller. ftp$ftpdnum$ext read zero\n";
} }
@ -167,6 +169,7 @@ sub startsf {
if($pong !~ /^PONG/) { if($pong !~ /^PONG/) {
logmsg "Failed sockfilt command: $cmd\n"; logmsg "Failed sockfilt command: $cmd\n";
kill(9, $sfpid); kill(9, $sfpid);
waitpid($sfpid, 0);
die "Failed to start sockfilt!"; die "Failed to start sockfilt!";
} }
} }
@ -569,6 +572,7 @@ sub PASV_command {
if($pong !~ /^PONG/) { if($pong !~ /^PONG/) {
kill(9, $slavepid); kill(9, $slavepid);
waitpid($slavepid, 0);
sendcontrol "500 no free ports!\r\n"; sendcontrol "500 no free ports!\r\n";
logmsg "failed to run sockfilt for data connection\n"; logmsg "failed to run sockfilt for data connection\n";
return 0; return 0;
@ -697,6 +701,7 @@ sub PORT_command {
if($pong !~ /^PONG/) { if($pong !~ /^PONG/) {
logmsg "Failed sockfilt for data connection\n"; logmsg "Failed sockfilt for data connection\n";
kill(9, $slavepid); kill(9, $slavepid);
waitpid($slavepid, 0);
} }
logmsg "====> Client DATA connect to port $port\n"; logmsg "====> Client DATA connect to port $port\n";
@ -712,6 +717,12 @@ sub customize {
$nosave = 0; # default is to save as normal $nosave = 0; # default is to save as normal
$controldelay = 0; # default is no delaying the responses $controldelay = 0; # default is no delaying the responses
$retrweirdo = 0;
$retrnosize = 0;
$pasvbadip = 0;
$nosave = 0;
%customcount = ();
%delayreply = ();
open(CUSTOM, "<log/ftpserver.cmd") || open(CUSTOM, "<log/ftpserver.cmd") ||
return 1; return 1;
@ -787,6 +798,7 @@ while(1) {
$| = 1; $| = 1;
kill(9, $slavepid) if($slavepid); kill(9, $slavepid) if($slavepid);
waitpid($slavepid, 0) if($slavepid);
$slavepid=0; $slavepid=0;
&customize(); # read test control instructions &customize(); # read test control instructions