Commit 1578d0b1 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424874 13f79535-47bb-0310-9956-ffa450edef68
parent 50e58c1f

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- 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]










































STATUS



+0
−5



























Changes for STATUS: 0 added lines, 5 removed lines.



Original line number
Diff line number
Diff line







@@ -153,8 +153,3 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:







              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
























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







@@ -1665,7 +1665,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







@@ -1418,7 +1418,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;