summaryrefslogtreecommitdiffstats
path: root/server/mpm/netware/mpm_netware.c
diff options
context:
space:
mode:
authorBradley Nicholes <bnicholes@apache.org>2002-11-25 18:46:26 +0100
committerBradley Nicholes <bnicholes@apache.org>2002-11-25 18:46:26 +0100
commitde524cdd36df6d812754cc62ab5d32a5098c789c (patch)
tree6def840ba8a4c6932321c732e6b5315ee1cf61a9 /server/mpm/netware/mpm_netware.c
parentLog reason for cache decline. (diff)
downloadapache2-de524cdd36df6d812754cc62ab5d32a5098c789c.tar.xz
apache2-de524cdd36df6d812754cc62ab5d32a5098c789c.zip
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
Diffstat (limited to '')
-rw-r--r--server/mpm/netware/mpm_netware.c8
1 files 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",