httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r483553 - in /httpd/httpd/branches/2.2.x: Makefile.win server/mpm/winnt/mpm_winnt.h
Date Thu, 07 Dec 2006 17:09:38 GMT
Author: wrowe
Date: Thu Dec  7 09:09:37 2006
New Revision: 483553

URL: http://svn.apache.org/viewvc?view=rev&rev=483553
Log:
Fix two flaws that make parallel testing of Apache2 (.0, .2, .x) very difficult,
change the default dir for command-line make to \Apache22 on Windows, and change
the service name to Apache2.2 by default (this *matches* the windows installer.)

Resolves recent bug reports and confusion.

Modified:
    httpd/httpd/branches/2.2.x/Makefile.win
    httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.h

Modified: httpd/httpd/branches/2.2.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Makefile.win?view=diff&rev=483553&r1=483552&r2=483553
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.win (original)
+++ httpd/httpd/branches/2.2.x/Makefile.win Thu Dec  7 09:09:37 2006
@@ -13,7 +13,7 @@
 # The following install defaults may be customized;
 #
 #   Option      Default
-#   INSTDIR     \Apache2
+#   INSTDIR     \Apache22
 #   PORT        80
 #   SSLPORT     443
 #   SERVERNAME  localhost
@@ -105,7 +105,7 @@
 !ENDIF
 
 !IF "$(INSTDIR)" == ""
-INSTDIR=\Apache2
+INSTDIR=\Apache22
 !ENDIF
 !IF "$(SERVERNAME)" == ""
 SERVERNAME=localhost

Modified: httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.h?view=diff&rev=483553&r1=483552&r2=483553
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.h (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.h Thu Dec  7 09:09:37 2006
@@ -32,7 +32,7 @@
 #define SERVICE_APACHE_RESTART 128
 
 #ifndef AP_DEFAULT_SERVICE_NAME
-#define AP_DEFAULT_SERVICE_NAME "Apache2"
+#define AP_DEFAULT_SERVICE_NAME "Apache2.2"
 #endif
 
 #define SERVICECONFIG9X "Software\\Microsoft\\Windows\\CurrentVersion\\RunServices"



Mime
View raw message