Commit f6f3fc40 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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.)


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

server/mpm/winnt/mpm_winnt.c

+1 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,7 @@ void winnt_rewrite_args(process_rec *process) 
    /* 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;

    }

server/mpm/winnt/mpm_winnt.h

+4 −1
Original line number Diff line number Diff line
@@ -83,7 +83,10 @@ apr_status_t ap_registry_delete_value(const char *key, const char *name); 


#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"