summaryrefslogtreecommitdiffstats
path: root/server/mpm/winnt/mpm_winnt.c
diff options
context:
space:
mode:
authorIan Holsman <ianh@apache.org>2001-11-24 00:49:24 +0100
committerIan Holsman <ianh@apache.org>2001-11-24 00:49:24 +0100
commita8dd4138640df256e5bfadd968f54cd2ff0fa3b4 (patch)
treeec9e7e53ee33fb715db2f6516751b3940013436f /server/mpm/winnt/mpm_winnt.c
parentfixed declaration mismatch for cgid_init() that was preventing compilation (diff)
downloadapache2-a8dd4138640df256e5bfadd968f54cd2ff0fa3b4.tar.xz
apache2-a8dd4138640df256e5bfadd968f54cd2ff0fa3b4.zip
Fix post-config hook to return a int.
I left the service start/stop/restart 'exits' in there, and changed the other ones to return HTTP_INTERNAL_SERVER_ERROR git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92148 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--server/mpm/winnt/mpm_winnt.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 3552852c39..2f0e0a5efa 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1855,7 +1855,7 @@ static void winnt_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pt
apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
}
-static void winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec* server)
+static int winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec* server)
{
static int restart_num = 0;
apr_status_t rv = 0;
@@ -1911,7 +1911,7 @@ static void winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *p
ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), ap_server_conf,
"Parent: Cannot create shutdown event %s", signal_shutdown_name);
CleanNullACL((void *)sa);
- exit(1);
+ return HTTP_INTERNAL_SERVER_ERROR;
}
/* Create restart event, apPID_restart, where PID is the parent
@@ -1923,7 +1923,7 @@ static void winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *p
ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), ap_server_conf,
"Parent: Cannot create restart event %s", signal_restart_name);
CleanNullACL((void *)sa);
- exit(1);
+ return HTTP_INTERNAL_SERVER_ERROR;
}
CleanNullACL((void *)sa);
@@ -1941,7 +1941,7 @@ static void winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *p
ap_log_error(APLOG_MARK,APLOG_ERR, rv, ap_server_conf,
"%s: Unable to start the service manager.",
service_name);
- exit(1);
+ return HTTP_INTERNAL_SERVER_ERROR;
}
}
}
@@ -1962,6 +1962,7 @@ static void winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *p
{
mpm_start_child_console_handler();
}
+ return OK;
}
AP_DECLARE(int) ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s )