httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/netware mpm_netware.c
Date Fri, 18 Jan 2002 23:26:07 GMT
bnicholes    02/01/18 15:26:07

  Modified:    server/mpm/netware mpm_netware.c
  Log:
  Updated the command line keyword to Apache2 and also modified the
  shutdown code for unloading the NLM
  
  Revision  Changes    Path
  1.24      +11 -9     httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mpm_netware.c	14 Jan 2002 18:55:15 -0000	1.23
  +++ mpm_netware.c	18 Jan 2002 23:26:07 -0000	1.24
  @@ -312,13 +312,13 @@
   
   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 @@
   
       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 @@
           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");
  
  
  

Mime
View raw message