From 06dc44afdf0dd6daf27c7a157ec30cd947a78931 Mon Sep 17 00:00:00 2001 From: Manoj Kasichainula Date: Mon, 23 Oct 2000 10:54:18 +0000 Subject: [PATCH] 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 --- os/unix/unixd.c | 2 +- os/unix/unixd.h | 2 +- server/mpm/dexter/dexter.c | 2 +- server/mpm/experimental/perchild/perchild.c | 2 +- server/mpm/mpmt_pthread/mpmt_pthread.c | 2 +- server/mpm/perchild/perchild.c | 2 +- server/mpm/prefork/prefork.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/os/unix/unixd.c b/os/unix/unixd.c index b51ad84fe6..caa87fe45d 100644 --- 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 ea1d01d12c..0fdfcc2715 100644 --- 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 05c7886bbc..900c08ea29 100644 --- 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 0916b99f31..a9c1c7bd0b 100644 --- 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 2ea0209592..5bd7b8b753 100644 --- 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 0916b99f31..a9c1c7bd0b 100644 --- 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 2a5abb9406..c5783f0451 100644 --- 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; -- 2.50.1