summaryrefslogtreecommitdiffstats
path: root/server/mpm/worker
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2002-03-20 06:58:21 +0100
committerWilliam A. Rowe Jr <wrowe@apache.org>2002-03-20 06:58:21 +0100
commitcec6d4b87026e384a0c78ac94b4c5fcfdfdc3330 (patch)
tree48e2f2374183fa982c80ba71e4e3d4248bc7d4fa /server/mpm/worker
parentThis commit was generated by cvs2svn to compensate for changes in r8100, (diff)
downloadapache2-cec6d4b87026e384a0c78ac94b4c5fcfdfdc3330.tar.xz
apache2-cec6d4b87026e384a0c78ac94b4c5fcfdfdc3330.zip
The pre_mpm hook creates server-lifetime objects (or at least, for the
generations across graceful restarts.) They should use the process pool. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94039 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--server/mpm/worker/worker.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 2f54073f53..e5a0f15936 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1508,7 +1508,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
}
if (!is_graceful) {
- if (ap_run_pre_mpm(pconf, SB_SHARED) != OK) {
+ if (ap_run_pre_mpm(s->process->pool, SB_SHARED) != OK) {
return 1;
}
/* fix the generation number in the global score; we just got a new,