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 mpm_winnt.h
Date Fri, 17 Aug 2001 17:00:07 GMT
wrowe       01/08/17 10:00:07

  Modified:    server/mpm/winnt mpm_winnt.c mpm_winnt.h
  Log:
    Since we expect many users to start experimenting with the next release,
    and the 'Apache' default server name definately conflicts with a stable
    1.3.20 install, changed the AP_DEFAULT_SERVICE_NAME to "Apache2" (unless
    the user overrides in the compilation.)
  
  Revision  Changes    Path
  1.174     +1 -1      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.173
  retrieving revision 1.174
  diff -u -r1.173 -r1.174
  --- mpm_winnt.c	2001/08/17 16:57:06	1.173
  +++ mpm_winnt.c	2001/08/17 17:00:07	1.174
  @@ -1766,7 +1766,7 @@
       /* 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);
  +                                           AP_DEFAULT_SERVICE_NAME);
           if (APR_STATUS_IS_ENOENT(service_set))
               service_set = SERVICE_UNSET;
       }
  
  
  
  1.28      +4 -1      httpd-2.0/server/mpm/winnt/mpm_winnt.h
  
  Index: mpm_winnt.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mpm_winnt.h	2001/05/07 18:41:44	1.27
  +++ mpm_winnt.h	2001/08/17 17:00:07	1.28
  @@ -83,7 +83,10 @@
   
   #define SERVICE_APACHE_RESTART 128
   
  -#define DEFAULT_SERVICE_NAME AP_SERVER_BASEPRODUCT
  +#ifndef AP_DEFAULT_SERVICE_NAME
  +#define AP_DEFAULT_SERVICE_NAME "Apache2"
  +#endif
  +
   #define SERVICECONFIG9X "Software\\Microsoft\\Windows\\CurrentVersion\\RunServices"
   #define SERVICECONFIG "System\\CurrentControlSet\\Services\\%s"
   #define SERVICEPARAMS "System\\CurrentControlSet\\Services\\%s\\Parameters"
  
  
  

Mime
View raw message