bjh 99/08/03 16:39:12
Modified: mpm/src/modules/mpm/spmt_os2 spmt_os2.c
Log:
Update OS/2 mpm with new hooks.
Revision Changes Path
1.7 +8 -12 apache-2.0/mpm/src/modules/mpm/spmt_os2/spmt_os2.c
Index: spmt_os2.c
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/spmt_os2/spmt_os2.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- spmt_os2.c 1999/07/27 12:05:05 1.6
+++ spmt_os2.c 1999/08/03 23:39:11 1.7
@@ -1603,15 +1603,9 @@
return 0;
}
-static void spmt_os2_hooks(void)
-{
- INIT_SIGLIST();
- /* TODO: set one_process properly */ one_process = 0;
-}
-
static void spmt_os2_pre_config(pool *pconf, pool *plog, pool *ptemp)
{
- one_process = getenv("ONE_PROCESS");
+ one_process = !!getenv("ONE_PROCESS");
is_graceful = 0;
ap_listen_pre_config();
@@ -1626,6 +1620,13 @@
ap_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
}
+static void spmt_os2_hooks(void)
+{
+ ap_hook_pre_config(spmt_os2_pre_config,NULL,NULL,HOOK_MIDDLE);
+ INIT_SIGLIST();
+ /* TODO: set one_process properly */ one_process = 0;
+}
+
static const char *set_pidfile(cmd_parms *cmd, void *dummy, char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -1792,9 +1793,6 @@
module MODULE_VAR_EXPORT mpm_spmt_os2_module = {
STANDARD20_MODULE_STUFF,
- spmt_os2_pre_config, /* pre_config */
- NULL, /* post_config */
- NULL, /* open_logs */
NULL, /* child_init */
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
@@ -1804,7 +1802,5 @@
NULL, /* handlers */
NULL, /* check auth */
NULL, /* check access */
- NULL, /* type_checker */
- NULL, /* pre-run fixups */
spmt_os2_hooks, /* register_hooks */
};
