Attachment 228408 Details for Bug 258767 – patch file for Apache PR 65592

[patch] patch file for Apache PR 65592

patch-server_mpm_event_event.c (text/plain), 1.10 KB, created by Bernard Spil on 2021-10-03 17:43:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2021-10-03 17:43:59 UTC

Size: 1.10 KB

patch

obsolete

>* Correctly decrement active_daemons also in the case that the child
>  process decides on its own to die because of MaxRequestsPerChild.
>
>  PR: 65592
>
>--- server/mpm/event/event.c.orig	2021-09-08 08:25:29 UTC
>+++ server/mpm/event/event.c
>@@ -2809,6 +2809,10 @@ static void perform_idle_server_maintenance(int child_
>         }
>         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;
>@@ -2888,7 +2892,6 @@ static void perform_idle_server_maintenance(int child_
>             ap_mpm_podx_signal(all_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 / "

Actions: View | Diff

Attachments on bug 258767: 228408