]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
merge these fixes from 2.1-dev:
authorJeff Trawick <trawick@apache.org>
Wed, 30 Mar 2005 09:42:15 +0000 (09:42 +0000)
committerJeff Trawick <trawick@apache.org>
Wed, 30 Mar 2005 09:42:15 +0000 (09:42 +0000)
commit17ac47209072655a1b7a1b40210437d7bfa668c8
tree78f4d05ec9d9b581007dd0b440afa67d8aecee30
parent1d3dc2840fe8452b0f1f56fa94202cc93ee91ecb
merge these fixes from 2.1-dev:

  *) worker MPM: Fix a problem which could cause httpd processes to
     remain active after shutdown.  [Jeff Trawick]

  *) Unix MPMs: Shut down the server more quickly when child processes are
     slow to exit.  [Joe Orton, Jeff Trawick]

Reviewed by: stoddard, striker

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@159470 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
include/mpm_common.h
server/mpm/worker/worker.c
server/mpm_common.c