https://bz.apache.org/bugzilla/show_bug.cgi?id=68561
--- Comment #3 from mskogorev <[email protected]> --- (In reply to Yann Ylavic from comment #1) > Did you also apply r1897149 ? I can't apply this patch. I think I need to apply some more patches. root@2e40a91a2837:/build/apache2-2.4.52# patch -p1 < /build/1897149.patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- httpd/httpd/branches/2.4.x/server/mpm/event/event.c 2022/01/17 08:31:13 1897148 |+++ httpd/httpd/branches/2.4.x/server/mpm/event/event.c 2022/01/17 08:43:50 1897149 -------------------------- File to patch: /build/apache2-2.4.52/server/mpm/event/event.c patching file /build/apache2-2.4.52/server/mpm/event/event.c Hunk #2 succeeded at 807 (offset 28 lines). Hunk #3 succeeded at 2035 (offset 28 lines). Hunk #4 succeeded at 2097 (offset 28 lines). Hunk #5 succeeded at 2112 (offset 28 lines). Hunk #6 FAILED at 3054. 1 out of 6 hunks FAILED -- saving rejects to file /build/apache2-2.4.52/server/mpm/event/event.c.rej This is my "event.c": /* non-fatal death... note that it's gone in the scoreboard. */ if (child_slot >= 0) { event_note_child_stopped(child_slot, 0, 0); if (processed_status == APEXIT_CHILDSICK) { /* resource shortage, minimize the fork rate */ retained->idle_spawn_rate[child_slot % num_buckets] = 1; } else if (remaining_children_to_start) { /* we're still doing a 1-for-1 replacement of dead * children with new children */ make_child(ap_server_conf, child_slot, child_slot % num_buckets); --remaining_children_to_start; } } and with patched: /* non-fatal death... note that it's gone in the scoreboard. */ if (child_slot >= 0) { process_score *ps; for (i = 0; i < threads_per_child; i++) ap_update_child_status_from_indexes(child_slot, i, SERVER_DEAD, NULL); event_note_child_killed(child_slot, 0, 0); ps = &ap_scoreboard_image->parent[child_slot]; if (ps->quiescing != 2) retained->active_daemons--; ps->quiescing = 0; /* NOTE: We don't dec in the (child_slot < 0) case! */ retained->total_daemons--; if (processed_status == APEXIT_CHILDSICK) { /* resource shortage, minimize the fork rate */ retained->idle_spawn_rate[child_slot % num_buckets] = 1; } else if (remaining_children_to_start) { /* we're still doing a 1-for-1 replacement of dead * children with new children */ make_child(ap_server_conf, child_slot, child_slot % num_buckets); --remaining_children_to_start; } } Do you know which patches I should apply before r1897149? -- You are receiving this mail because: You are the assignee for the bug. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
