Mailing List Archive

Author: rpluem
Date: Wed Sep 22 18:48:25 2021
New Revision: 1893520

URL: http://svn.apache.org/viewvc?rev=1893520&view=rev
Log:
* Correctly decrement active_daemons also in the case that the child
process decides on its own to die because of MaxRequestsPerChild.

PR: 65592

Added:
httpd/httpd/trunk/changes-entries/pr65592.txt (with props)
Modified:
httpd/httpd/trunk/server/mpm/event/event.c

Added: httpd/httpd/trunk/changes-entries/pr65592.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/changes-entries/pr65592.txt?rev=1893520&view=auto
==============================================================================
--- httpd/httpd/trunk/changes-entries/pr65592.txt (added)
+++ httpd/httpd/trunk/changes-entries/pr65592.txt Wed Sep 22 18:48:25 2021
@@ -0,0 +1,3 @@
+ *) event mpm: Correctly count active child processes in parent process if
+ child process dies due to MaxConnectionsPerChild.
+ PR 65592 [Ruediger Pluem]

Propchange: httpd/httpd/trunk/changes-entries/pr65592.txt
------------------------------------------------------------------------------
svn:eol-style = native

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1893520&r1=1893519&r2=1893520&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Wed Sep 22 18:48:25 2021
@@ -3118,6 +3118,10 @@ static void perform_idle_server_maintena
}
ps = &ap_scoreboard_image->parent[i];
if (ps->pid != 0) {
+ if (ps->quiescing == 1) {
+ ps->quiescing = 2;
+ active_daemons--;
+ }
for (j = 0; j < threads_per_child; j++) {
ws = &ap_scoreboard_image->servers[i][j];
status = ws->status;
@@ -3197,7 +3201,6 @@ static void perform_idle_server_maintena
ap_mpm_podx_signal(retained->buckets[child_bucket].pod,
AP_MPM_PODX_GRACEFUL);
retained->idle_spawn_rate[child_bucket] = 1;
- active_daemons--;
} else {
ap_log_error(APLOG_MARK, APLOG_TRACE5, 0, ap_server_conf,
"Not shutting down child: total daemons %d / "