From: Tomas Doran <bobtfish@bobtfish.net>
Date: Tue, 4 Oct 2011 07:26:26 +0000 (+0100)
Subject: Version 0.24
X-Git-Tag: 0.24^0
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5ef2d8bb0bb4182e1f196e05e86a175052a2bfa8;hp=a7ce9ea3ab904c9db0d798591de849ff4f7a4aac;p=catagits%2FFCGI-ProcManager.git

Version 0.24
---

diff --git a/ChangeLog b/ChangeLog
index 112bd79..745f7c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+0.24 2011-10-04 Tomas Doran  <bobtfish@bobtfish.net>
+    * Further fix to pm_wait routine to find the correct PID and remove it
+      (fixing logical error introduced in the last release), noted by Vadim
+      Dashkevich
+    * Document (somewhat) FCGI::ProcManager::Constrainted
+
 0.23 2011-09-27 Tomas Doran  <bobtfish@bobtfish.net>
     * Fix pm_wait routine to exit without a warning
     * Fix pm_wait to correctly detect child processes which have died.
diff --git a/lib/FCGI/ProcManager.pm b/lib/FCGI/ProcManager.pm
index 868d1be..e24683a 100644
--- a/lib/FCGI/ProcManager.pm
+++ b/lib/FCGI/ProcManager.pm
@@ -335,7 +335,7 @@ sub pm_wait {
   my ($this) = self_or_default(@_);
 
   # wait for the next server to die.
-  return if (my $pid = wait() < 0);
+  return if ((my $pid = wait()) < 0);
 
   # notify when one of our servers have died.
   delete $this->{PIDS}->{$pid} and
diff --git a/lib/FCGI/ProcManager/Constrained.pm b/lib/FCGI/ProcManager/Constrained.pm
index 5423b68..7b30a31 100644
--- a/lib/FCGI/ProcManager/Constrained.pm
+++ b/lib/FCGI/ProcManager/Constrained.pm
@@ -204,3 +204,24 @@ sub _linux_getppid { return Linux::Pid::getppid() }
 
 1;
 
+=head1 NAME
+
+FCGI::ProcManager::Constrained - Process manager with constraints
+
+=head1 SYNOPSIS
+
+    $ENV{PM_MAX_REQUESTS} = 1000;
+    $ENV{PM_SIZECHECK_NUM_REQUESTS} = 10;
+    $ENV{PM_MAX_SIZE} = 4096;
+
+=head1 DESCRIPTION
+
+Subclass of L<FCGI::ProcManager> which adds checks for memory limits
+like L<Apache::SizeLimit>.
+
+=head1 AUTHORS, COPYRIGHT AND LICENSE
+
+See L<FCGI::ProcManager>.
+
+=cut
+