Now that we're at 2.4.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201972 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/InstallBin.dsp b/InstallBin.dsp
index 64290afef5220f02a3f23fce497959edabbc1f3f..e2a7aa91616e6b35f4e3d8ea6a260bdeffc8dee0 100644 (file)
--- a/InstallBin.dsp
+++ b/InstallBin.dsp
@@ -33,15 +33,15 @@ CFG=InstallBin - Win32 Debug
 # PROP BASE Intermediate_Dir "Release"
 # PROP BASE Cmd_Line "NMAKE /f InstallBin.mak"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "\Apache2x\bin\httpd.exe"
+# PROP BASE Target_File "\Apache24\bin\httpd.exe"
 # PROP BASE Bsc_Name "InstallBin.bsc"
 # PROP BASE Target_Dir ""
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2x" SHORT=R LONG=Release _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache24" SHORT=R LONG=Release _install"
 # PROP Rebuild_Opt ""
-# PROP Target_File "\Apache2x\bin\httpd.exe"
+# PROP Target_File "\Apache24\bin\httpd.exe"
 # PROP Bsc_Name "Browse\httpd.bsc"
 # PROP Target_Dir ""
 
@@ -52,15 +52,15 @@ CFG=InstallBin - Win32 Debug
 # PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Cmd_Line "NMAKE /f InstallBin.mak"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "\Apache2x\bin\httpd.exe"
+# PROP BASE Target_File "\Apache24\bin\httpd.exe"
 # PROP BASE Bsc_Name "InstallBin.bsc"
 # PROP BASE Target_Dir ""
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2x" SHORT=D LONG=Debug _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache24" SHORT=D LONG=Debug _install"
 # PROP Rebuild_Opt ""
-# PROP Target_File "\Apache2x\bin\httpd.exe"
+# PROP Target_File "\Apache24\bin\httpd.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 

diff --git a/Makefile.win b/Makefile.win
index 3051e5f77bee55a36781cd29ce9f9d57c402864f..cee1610dbaa9b91dbda076e86c62029ff497a84f 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -13,7 +13,7 @@
 # The following install defaults may be customized;
 #
 #   Option      Default
-#   INSTDIR     /Apache2x
+#   INSTDIR     /Apache24
 #   PORT        80
 #   SSLPORT     443
 #   DOMAINNAME  example.com
@@ -241,7 +241,7 @@ _trydb:
 
 
 !IF "$(INSTDIR)" == ""
-INSTDIR=\Apache2x
+INSTDIR=\Apache24
 !ENDIF
 !IF "$(DOMAINNAME)" == ""
 DOMAINNAME=example.com

diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index 43adda994c00c087c0e68b72b61916cb4a7e5416..62340d229293a2e2509a839e9b437f471b89e31b 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.h
+++ b/server/mpm/winnt/mpm_winnt.h
@@ -33,7 +33,7 @@
 #define SERVICE_APACHE_RESTART 128
 
 #ifndef AP_DEFAULT_SERVICE_NAME
-#define AP_DEFAULT_SERVICE_NAME "Apache2.x"
+#define AP_DEFAULT_SERVICE_NAME "Apache2.4"
 #endif
 
 #define SERVICECONFIG "System\\CurrentControlSet\\Services\\%s"