From 04b2197f96a6e3f85a15c1225eef49d8c006f6a7 Mon Sep 17 00:00:00 2001 From: Bradley Nicholes Date: Mon, 25 Nov 2002 17:46:26 +0000 Subject: [PATCH] Force the screen to close on exit() if the -E option was specified on the command line git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97647 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/netware/mpm_netware.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index 6bfff25532..658c4af1b9 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -912,8 +912,12 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) startup_workers(ap_threads_to_start); - /* Allow the Apache screen to be closed normally on exit()*/ - hold_screen_on_exit = 0; + /* Allow the Apache screen to be closed normally on exit() only if it + has not been explicitly forced to close on exit(). (ie. the -E flag + was specified at startup) */ + if (hold_screen_on_exit > 0) { + hold_screen_on_exit = 0; + } ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, "%s configured -- resuming normal operations", -- 2.40.0