VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-01 16:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Manoj Kasichainula
2000-10-23 10:54:18 +00:00
parent a90cfa54f1
commit 603dec1da3
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
os/unix/unixd.c
View File

@ -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);

2
os/unix/unixd.h
View File

@ -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) || \

2
server/mpm/dexter/dexter.c
View File

@ -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;

2
server/mpm/experimental/perchild/perchild.c
View File

@ -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;

2
server/mpm/mpmt_pthread/mpmt_pthread.c
View File

@ -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;

2
server/mpm/perchild/perchild.c
View File

@ -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;

2
server/mpm/prefork/prefork.c
View File

@ -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;