You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@locus.apache.org on 2000/10/23 12:54:22 UTC
cvs commit: apache-2.0/src/os/unix unixd.c unixd.h
manoj 00/10/23 03:54:21
Modified: src/modules/mpm/dexter dexter.c
src/modules/mpm/mpmt_pthread mpmt_pthread.c
src/modules/mpm/perchild perchild.c
src/modules/mpm/prefork prefork.c
src/os/unix unixd.c unixd.h
Log:
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.
Revision Changes Path
1.129 +1 -1 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- dexter.c 2000/10/18 19:12:10 1.128
+++ dexter.c 2000/10/23 10:54:14 1.129
@@ -1150,7 +1150,7 @@
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;
1.124 +1 -1 apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
Index: mpmt_pthread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- mpmt_pthread.c 2000/10/18 19:12:13 1.123
+++ mpmt_pthread.c 2000/10/23 10:54:15 1.124
@@ -1184,7 +1184,7 @@
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;
1.24 +1 -1 apache-2.0/src/modules/mpm/perchild/perchild.c
Index: perchild.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/perchild/perchild.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perchild.c 2000/10/18 19:12:14 1.23
+++ perchild.c 2000/10/23 10:54:16 1.24
@@ -1312,7 +1312,7 @@
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;
1.133 +1 -1 apache-2.0/src/modules/mpm/prefork/prefork.c
Index: prefork.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- prefork.c 2000/10/18 19:12:15 1.132
+++ prefork.c 2000/10/23 10:54:17 1.133
@@ -1537,7 +1537,7 @@
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;
1.26 +1 -1 apache-2.0/src/os/unix/unixd.c
Index: unixd.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/unixd.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- unixd.c 2000/10/16 06:05:12 1.25
+++ unixd.c 2000/10/23 10:54:18 1.26
@@ -212,7 +212,7 @@
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);
1.14 +1 -1 apache-2.0/src/os/unix/unixd.h
Index: unixd.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/unixd.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- unixd.h 2000/10/16 06:05:12 1.13
+++ unixd.h 2000/10/23 10:54:18 1.14
@@ -84,7 +84,7 @@
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) || \