Make apache -k shutdown an alias for apache -k stop. "shutdown" maintained

for backward compatability.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93360 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index c609400723fa086402612d5a6192f55be99b2e95..633a9dae01825c28e8beb6e762e93fd22033bd36 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 Changes with Apache 2.0.32-dev
+  *) Win32: apache -k shutdown now behaves like apache -k stop.
+     [Bill Stoddard]
+
   *) Win32: Get apache -k restart -n apache2 working reliabily again.
      [Bill Stoddard]
  

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 49d35a1684bb18f5ff5949182a2ce0b7e364c189..1a954bf137fa034ba73fb2fce70d48c56f4afca8 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -2110,6 +2110,7 @@ static int winnt_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
      *   -k runservice [WinNT errors logged from rewrite_args]
      *   -k uninstall
      *   -k stop
+     *   -k shutdown (same as -k stop). Maintained for backward compatability.
      *
      * in these cases we -don't- care if httpd.conf has config errors!
      */
@@ -2133,7 +2134,8 @@ static int winnt_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
         exit(rv);
     }
 
-    if (!strcasecmp(signal_arg, "stop")) {
+    if ((!strcasecmp(signal_arg, "stop")) || 
+        (!strcasecmp(signal_arg, "shutdown"))) {
         mpm_signal_service(ptemp, 0);
         exit(0);
     }