From 3323ed3c171bc2c59ede9f499eb1ce50d48bde20 Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Thu, 22 May 2008 23:40:56 -0700 Subject: [PATCH] Avoid re-forking. Fixes bug #20458. --- tests/ChangeLog | 4 ++++ tests/FTPServer.pm | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index f485f93c..757ed339 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2008-05-22 Micah Cowan + + * FTPServer.pm (run): Avoid re-forking. Fixes bug #20458. + 2008-04-26 Micah Cowan * Makefile.am, Test-proxied-https-auth.px: Added a test for diff --git a/tests/FTPServer.pm b/tests/FTPServer.pm index 7c7f3e58..d8ad8b0c 100644 --- a/tests/FTPServer.pm +++ b/tests/FTPServer.pm @@ -833,14 +833,14 @@ sub run print STDERR "got a connection from: $client_ipnum\n" if $log; # fork off a process to handle this connection. - my $pid = fork(); - unless (defined $pid) { - warn "fork: $!"; - sleep 5; # Back off in case system is overloaded. - next; - } - - if ($pid == 0) { # Child process. + # my $pid = fork(); + # unless (defined $pid) { + # warn "fork: $!"; + # sleep 5; # Back off in case system is overloaded. + # next; + # } + + if (1) { # Child process. # install signals $SIG{URG} = sub { -- 2.39.2