From d30c57ec3af8e90df991013c655292f355fa5a73 Mon Sep 17 00:00:00 2001 From: Brian Havard Date: Tue, 3 Aug 1999 23:39:11 +0000 Subject: [PATCH] Update OS/2 mpm with new hooks. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83564 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/spmt_os2/spmt_os2.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c index ae47780904..2b335ae606 100644 --- a/server/mpm/spmt_os2/spmt_os2.c +++ b/server/mpm/spmt_os2/spmt_os2.c @@ -1603,15 +1603,9 @@ int ap_mpm_run(pool *_pconf, pool *plog, server_rec *s) 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 @@ static void spmt_os2_pre_config(pool *pconf, pool *plog, pool *ptemp) 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 @@ LISTEN_COMMANDS 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 @@ module MODULE_VAR_EXPORT mpm_spmt_os2_module = { NULL, /* handlers */ NULL, /* check auth */ NULL, /* check access */ - NULL, /* type_checker */ - NULL, /* pre-run fixups */ spmt_os2_hooks, /* register_hooks */ }; -- 2.40.0