https://bz.apache.org/bugzilla/show_bug.cgi?id=68561
--- Comment #4 from Yann Ylavic <ylavic....@gmail.com> ---
To resolve this conflict you should apply r1897149 before r1901199 (which you
said you applied already).
But it also means that by applying r1901199 you probably had to resolve a
conflict around this code already, namely in server_main_loop() function:
- if (ps->quiescing != 2)
- retained->active_daemons--;
While the original code (before/without r1897149) was:
- if (!ps->quiescing)
- retained->active_daemons--;
In r1901199 this moved to event_note_child_stopped() as:
+ if (ps->quiescing != 2) { /* vs perform_idle_server_maintenance() */
+ retained->active_daemons--;
+ }
So depending on how you resolved this conflict with r1901199 you may have the
correct code already in event_note_child_stopped() (the test should be
"(ps->quiescing != 2)"), but I'd suggest restarting from the original event.c
from 2.4.52 and applying r1897149 and r1901199 in this order to avoid conflicts
and be sure to run with the correct code.
--
You are receiving this mail because:
You are the assignee for the bug.
---------------------------------------------------------------------
To unsubscribe, e-mail: bugs-unsubscr...@httpd.apache.org
For additional commands, e-mail: bugs-h...@httpd.apache.org
