You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2006/07/24 03:34:59 UTC
svn commit: r424874 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
server/mpm/experimental/event/event.c server/mpm/worker/worker.c
Author: trawick
Date: Sun Jul 23 18:34:58 2006
New Revision: 424874
URL: http://svn.apache.org/viewvc?rev=424874&view=rev
Log:
merge from trunk:
worker and event MPMs: fix excessive forking if fork() or child_init
take a long time.
PR: 39275
Reviewed by: trawick, gregames, pquerna
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c
httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=424874&r1=424873&r2=424874&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sun Jul 23 18:34:58 2006
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.3
+ *) 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> ]
+
*) configure: Add "--with-included-apr" flag to force use of the
bundled version of APR at build time. [Joe Orton]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=424874&r1=424873&r2=424874&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Jul 23 18:34:58 2006
@@ -153,8 +153,3 @@
ways how to fix this and take care about the flush buckets.
I am willing to propose patches, but due to personal time
constraints they will not show up before the second half of July.
-
- * worker and event MPMs: fix excessive forking if fork() or child_init
- take a long time. PR 39275.
- http://svn.apache.org/viewvc?view=rev&revision=399099
- +1: trawick, gregames, pquerna
Modified: httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c?rev=424874&r1=424873&r2=424874&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c Sun Jul 23 18:34:58 2006
@@ -1665,7 +1665,7 @@
*/
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;
}
Modified: httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c?rev=424874&r1=424873&r2=424874&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c Sun Jul 23 18:34:58 2006
@@ -1418,7 +1418,7 @@
*/
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;