Updated the command line keyword to Apache2 and also modified the

shutdown code for unloading the NLM

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

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index f389677fd1855b3752c452b16d14d78f341b13bd..be1ff462dc74fb05e0aebc7bcc1261f1a197309b 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -312,13 +312,13 @@ static void set_signals(void)
 
 int nlmUnloadSignaled()
 {
-    if (shutdown_pending == 1) {
-        printf ("Shutdown in progress. Please wait...\n");
-    }
-    else {
-        shutdown_pending = 1;
-        printf ("Shutdown signalled. Please wait...\n");
+    shutdown_pending = 1;
+
+/* Hold off on this change for now */
+/*    while (wait_to_finish) {
+        NXThreadYield();
     }
+*/
     return 0;
 }
 
@@ -1051,10 +1051,12 @@ static int CommandLineInterpreter(scr_t screenID, const char *commandLine)
 
     if (commandLine == NULL)
         return NOTMYCOMMAND;
+    if (strlen(commandLine) <= strlen(szCommand))
+        return NOTMYCOMMAND;
 
     strncpy (szcommandLine, commandLine, sizeof(szcommandLine)-1);
 
-    /*  All added commands begin with "HTTPD " */
+    /*  All added commands begin with "APACHE2 " */
 
     if (!strnicmp(szCommand, szcommandLine, iCommandLen)) {
         ActivateScreen (getscreenhandle());
@@ -1105,8 +1107,8 @@ static int CommandLineInterpreter(scr_t screenID, const char *commandLine)
         else {
             show_settings = 0;
             if (!strnicmp("HELP",&szcommandLine[iCommandLen],3))
-                printf("Unknown HTTPD command %s\n", &szcommandLine[iCommandLen]);
-            printf("Usage: HTTPD [command] [-p <instance ID>]\n");
+                printf("Unknown APACHE2 command %s\n", &szcommandLine[iCommandLen]);
+            printf("Usage: APACHE2 [command] [-p <instance ID>]\n");
             printf("Commands:\n");
             printf("\tDIRECTIVES - Show directives\n");
             printf("\tHELP       - Display this help information\n");