Add a temporary pool argument to unixd_pre_config, so that it can call

APR functions (grumble). This is needed for apr_stat, which will be in
the suexec path coming up.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86710 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index b51ad84fe652d44e4f6959eaaba74cd7da69f4ae..caa87fe45de6070ad50a3fe30337f8f2b6de09fa 100644 (file)
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -212,7 +212,7 @@ const char *unixd_set_group(cmd_parms *cmd, void *dummy, const char *arg)
     return NULL;
 }
 
-void unixd_pre_config(void)
+void unixd_pre_config(apr_pool_t *ptemp)
 {
     unixd_config.user_name = DEFAULT_USER;
     unixd_config.user_id = ap_uname2id(DEFAULT_USER);

diff --git a/os/unix/unixd.h b/os/unix/unixd.h
index ea1d01d12cdebadfad953c3dff824d1482ac8a10..0fdfcc271584ed1f19d7910b9f406fd045f9f369 100644 (file)
--- a/os/unix/unixd.h
+++ b/os/unix/unixd.h
@@ -84,7 +84,7 @@ typedef struct {
 extern unixd_config_rec unixd_config;
 
 int unixd_setup_child(void);
-void unixd_pre_config(void);
+void unixd_pre_config(apr_pool_t *ptemp);
 const char *unixd_set_user(cmd_parms *cmd, void *dummy, const char *arg);
 const char *unixd_set_group(cmd_parms *cmd, void *dummy, const char *arg);
 #if defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || \

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 05c7886bbcf3800b9ca9baea9f5506d30bf4f317..900c08ea290f386b302f2981f91df2d9c887a709 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -1150,7 +1150,7 @@ static void dexter_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp
        my_pid = getpid();
     }
 
-    unixd_pre_config();
+    unixd_pre_config(ptemp);
     ap_listen_pre_config();
     num_daemons = DEFAULT_NUM_DAEMON;
     threads_to_start = DEFAULT_START_THREAD;

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 0916b99f3145291ba6f19a90010f8c7239502031..a9c1c7bd0b6447dcccb4790760afffefbae95416 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -1312,7 +1312,7 @@ static void perchild_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *pte
        my_pid = getpid();
     }
 
-    unixd_pre_config();
+    unixd_pre_config(ptemp);
     ap_listen_pre_config();
     num_daemons = DEFAULT_NUM_DAEMON;
     threads_to_start = DEFAULT_START_THREAD;

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 2ea020959266f00da13de7f26dc9b9f4b29f5df1..5bd7b8b7539caf142917a211163c6396eeb3fc2f 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -1184,7 +1184,7 @@ static void mpmt_pthread_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_poo
        ap_my_pid = getpid();
     }
 
-    unixd_pre_config();
+    unixd_pre_config(ptemp);
     ap_listen_pre_config();
     ap_daemons_to_start = DEFAULT_START_DAEMON;
     min_spare_threads = DEFAULT_MIN_FREE_DAEMON * DEFAULT_THREADS_PER_CHILD;

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index 0916b99f3145291ba6f19a90010f8c7239502031..a9c1c7bd0b6447dcccb4790760afffefbae95416 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -1312,7 +1312,7 @@ static void perchild_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *pte
        my_pid = getpid();
     }
 
-    unixd_pre_config();
+    unixd_pre_config(ptemp);
     ap_listen_pre_config();
     num_daemons = DEFAULT_NUM_DAEMON;
     threads_to_start = DEFAULT_START_THREAD;

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 2a5abb940604f74b00330652cb968cf2495d1341..c5783f04515bcb6d7c9607b230e8e2600c7c7e8a 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1537,7 +1537,7 @@ static void prefork_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptem
        ap_my_pid = getpid();
     }
 
-    unixd_pre_config();
+    unixd_pre_config(ptemp);
     ap_listen_pre_config();
     ap_daemons_to_start = DEFAULT_START_DAEMON;
     ap_daemons_min_free = DEFAULT_MIN_FREE_DAEMON;