diff options
| author | Jeff Trawick <trawick@apache.org> | 2011-03-28 18:25:20 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2011-03-28 18:25:20 +0200 |
| commit | 5e3ba7d3ee5fc110298721d4dc5f87ca09bef940 (patch) | |
| tree | d29983f4ddc654fdaae8b9701c3ca53611eca9a2 /server/core.c | |
| parent | Resolve disagreement with its prototype (diff) | |
| download | apache2-5e3ba7d3ee5fc110298721d4dc5f87ca09bef940.tar.xz apache2-5e3ba7d3ee5fc110298721d4dc5f87ca09bef940.zip | |
mpm_common.c implements a handful of config directives; the
related state has to be re-initialized to the default values
at pre-config time, but that was handled inconsistently by
the MPMs, resulting in unexpected behavior when some of the
directives were removed across restart
move that necessary initialization from the MPMs to common
code run from core's pre-config; MPMs that need to override
defaults can do so by running after core's pre-config (the
NetWare MPM now does that)
the DEFAULT_MAX_REQUESTS_PER_CHILD compile setting wasn't useful
enough to keep
the simple MPM wasn't consistent in which of these directives
were respected and which weren't, and that hasn't changed
(see procmgr.max_requests_per_child vs. ap_max_requests_per_child)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086293 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/core.c')
| -rw-r--r-- | server/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server/core.c b/server/core.c index 6600df332e..846ee7532b 100644 --- a/server/core.c +++ b/server/core.c @@ -4150,6 +4150,8 @@ static int core_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptem apr_pool_cleanup_register(pconf, NULL, reset_config_defines, apr_pool_cleanup_null); + mpm_common_pre_config(pconf); + return APR_SUCCESS; } |