You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gs...@apache.org on 2011/11/15 01:07:56 UTC
svn commit: r1201972 - in /httpd/httpd/branches/2.4.x: InstallBin.dsp
Makefile.win server/mpm/winnt/mpm_winnt.h
Author: gsmith
Date: Tue Nov 15 00:07:56 2011
New Revision: 1201972
URL: http://svn.apache.org/viewvc?rev=1201972&view=rev
Log:
Now that we're at 2.4.0
Modified:
httpd/httpd/branches/2.4.x/InstallBin.dsp
httpd/httpd/branches/2.4.x/Makefile.win
httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.h
Modified: httpd/httpd/branches/2.4.x/InstallBin.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/InstallBin.dsp?rev=1201972&r1=1201971&r2=1201972&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/InstallBin.dsp (original)
+++ httpd/httpd/branches/2.4.x/InstallBin.dsp Tue Nov 15 00:07:56 2011
@@ -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 ""
Modified: httpd/httpd/branches/2.4.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.win?rev=1201972&r1=1201971&r2=1201972&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.win (original)
+++ httpd/httpd/branches/2.4.x/Makefile.win Tue Nov 15 00:07:56 2011
@@ -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
Modified: httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.h?rev=1201972&r1=1201971&r2=1201972&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.h (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.h Tue Nov 15 00:07:56 2011
@@ -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"