httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c
Date Fri, 17 Aug 2001 16:57:06 GMT
wrowe       01/08/17 09:57:06

  Modified:    server/mpm/winnt mpm_winnt.c
  Log:
    Don't retrieve the default service name if the -k run arg is given.
    -k run represents running 'in a console', and is the default if no
    -k option is given at all.
  
    Perhaps we want to assume -k start as the default (meaning a console
    user in the future would have to explicitly ask for -k run if they
    want to test as a console) now that services are far more stable.
    That can be debated as a seperate patch.
  
  Revision  Changes    Path
  1.173     +5 -2      httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.172
  retrieving revision 1.173
  diff -u -r1.172 -r1.173
  --- mpm_winnt.c	2001/08/17 16:47:01	1.172
  +++ mpm_winnt.c	2001/08/17 16:57:06	1.173
  @@ -129,7 +129,7 @@
   static char ap_coredump_dir[MAX_STRING_LEN];
   
   static int one_process = 0;
  -static char const* signal_arg;
  +static char const* signal_arg = NULL;
   
   OSVERSIONINFO osver; /* VER_PLATFORM_WIN32_NT */
   
  @@ -1763,9 +1763,12 @@
           }
       }
   
  -    if (service_set == SERVICE_UNSET) {
  +    /* Get the default for any -k option, except run */
  +    if (service_set == SERVICE_UNSET && strcasecmp(signal_arg, "run")) {
           service_set = mpm_service_set_name(process->pool, &service_name,
                                              DEFAULT_SERVICE_NAME);
  +        if (APR_STATUS_IS_ENOENT(service_set))
  +            service_set = SERVICE_UNSET;
       }
   
       if (!strcasecmp(signal_arg, "install")) /* -k install */
  
  
  

Mime
View raw message