Commit 540d5f57 authored May 03, 2006 by Greg Ames

PR 39275. don't fork MaxClients worth of processes if child_init or fork() are

slow.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@399099 13f79535-47bb-0310-9956-ffa450edef68

parent 2b9a3e13

CHANGES

+4 −0

Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,6 +2,10 @@
		Changes with Apache 2.3.0
		[Remove entries to the current 2.0 and 2.2 section below, when backported]

		*) worker and event MPMs: fix excessive forking if fork() or child_init
		take a long time. PR 39275.
		[Greg Ames, Jeff Trawick, Chris Darroch <chrisd pearsoncmg.com> ]

		*) Add mod_proxy_fcgi, a FastCGI back end for mod_proxy.
		[Garrett Rooney, Jim Jagielski, Paul Querna]

server/mpm/experimental/event/event.c

+1 −1

Changes for server/mpm/experimental/event/event.c: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -1730,7 +1730,7 @@ static void perform_idle_server_maintenance(void)
		*/
		if (ps->pid != 0) { /* XXX just set all_dead_threads in outer
		for loop if no pid? not much else matters */
		if (status <= SERVER_READY && status != SERVER_DEAD &&
		if (status <= SERVER_READY &&
		!ps->quiescing && ps->generation == ap_my_generation) {
		++idle_thread_count;
		}

server/mpm/worker/worker.c

+1 −1

Changes for server/mpm/worker/worker.c: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -1422,7 +1422,7 @@ static void perform_idle_server_maintenance(void)
		*/
		if (ps->pid != 0) { /* XXX just set all_dead_threads in outer for
		loop if no pid? not much else matters */
		if (status <= SERVER_READY && status != SERVER_DEAD &&
		if (status <= SERVER_READY &&
		!ps->quiescing &&
		ps->generation == ap_my_generation) {
		++idle_thread_count;