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

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index a703d8e506f1fbaeb0a32b3ab81b370168892fb5..99bc1764436b66b5fc4e7aa5dc19740e8d32e409 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -839,7 +839,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     
     if (!is_graceful) {
         /* setup the scoreboard shared memory */
-        if (ap_run_pre_mpm(pconf, SB_SHARED) != OK) {
+        if (ap_run_pre_mpm(s->process->pool, SB_SHARED) != OK) {
             return 1;
         }
 

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 82b111a5d5ffc76df7bc682e25a899125861a90c..2216b914c7cc6c48e7ba348d20cbe7cbd8deb392 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -1304,7 +1304,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;
         }
     }

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index 2b519d4c4bdfe22d4c01502f71cafc4c6a137dab..84211461d367524c155f7a64ba9174b3ea588845 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -893,7 +893,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     apr_thread_mutex_create(&accept_mutex, APR_THREAD_MUTEX_DEFAULT, pconf);
 
     if (!is_graceful) {
-        if (ap_run_pre_mpm(pconf, SB_NOT_SHARED) != OK) {
+        if (ap_run_pre_mpm(s->process->pool, SB_NOT_SHARED) != OK) {
             return 1;
         }
     }

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index 82b111a5d5ffc76df7bc682e25a899125861a90c..2216b914c7cc6c48e7ba348d20cbe7cbd8deb392 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -1304,7 +1304,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;
         }
     }

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 80c73de297722c0eb400326d77dcb9069cc134b1..8a3f23c9a24592a678152599655968ccf7cfe997 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -974,7 +974,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,

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 46e470420b7fb4f1ed425a6e93bc9ed28aaa7654..03b1318c07e68c968bf06a62d733c59fe3a3b28a 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -2389,7 +2389,7 @@ AP_DECLARE(int) ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s )
      */
     if (!restart && ((parent_pid == my_pid) || one_process)) {
         /* Set up the scoreboard. */
-        if (ap_run_pre_mpm(pconf, SB_SHARED) != OK) {
+        if (ap_run_pre_mpm(s->process->pool, SB_SHARED) != OK) {
             return 1;
         }
     }

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 2f54073f53659fa62c8298e6cef901bf95f498a8..e5a0f15936d8dc4ac00f80f6fd71d449978e5ef9 100644 (file)
--- 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,