Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BE4BD92D9 for ; Wed, 4 Apr 2012 20:12:26 +0000 (UTC) Received: (qmail 63398 invoked by uid 500); 4 Apr 2012 20:12:26 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 63340 invoked by uid 500); 4 Apr 2012 20:12:26 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 63330 invoked by uid 99); 4 Apr 2012 20:12:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2012 20:12:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2012 20:12:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DBBDE2388980; Wed, 4 Apr 2012 20:11:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1309579 - in /httpd/httpd/branches/2.4.x: build/ build/aix/ docs/manual/mod/ docs/manual/rewrite/ include/ modules/arch/unix/ modules/cluster/ modules/filters/ modules/lua/ modules/lua/test/ modules/lua/test/htdocs/ modules/proxy/ modules/... Date: Wed, 04 Apr 2012 20:11:58 -0000 To: cvs@httpd.apache.org From: nd@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120404201158.DBBDE2388980@eris.apache.org> Author: nd Date: Wed Apr 4 20:11:57 2012 New Revision: 1309579 URL: http://svn.apache.org/viewvc?rev=1309579&view=rev Log: fix various property issues Modified: httpd/httpd/branches/2.4.x/build/NWGNUscripts.inc (contents, props changed) httpd/httpd/branches/2.4.x/build/aix/README (props changed) httpd/httpd/branches/2.4.x/build/aix/aixinfo (props changed) httpd/httpd/branches/2.4.x/build/aix/aixproto.ksh (props changed) httpd/httpd/branches/2.4.x/build/aix/buildaix.ksh (props changed) httpd/httpd/branches/2.4.x/build/aix/mkinstallp.ksh (props changed) httpd/httpd/branches/2.4.x/build/mkdep.perl (contents, props changed) httpd/httpd/branches/2.4.x/docs/manual/mod/mod_lua.html.fr (props changed) httpd/httpd/branches/2.4.x/docs/manual/mod/mod_lua.xml.fr (props changed) httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.html.fr (props changed) httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.xml.fr (props changed) httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.html.fr (props changed) httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml.fr (props changed) httpd/httpd/branches/2.4.x/docs/manual/rewrite/avoid.html.fr (props changed) httpd/httpd/branches/2.4.x/docs/manual/rewrite/avoid.xml.fr (props changed) httpd/httpd/branches/2.4.x/docs/manual/rewrite/htaccess.html.fr (props changed) httpd/httpd/branches/2.4.x/docs/manual/rewrite/htaccess.xml.fr (props changed) httpd/httpd/branches/2.4.x/include/apache_noprobes.h (props changed) httpd/httpd/branches/2.4.x/modules/arch/unix/Makefile.in (props changed) httpd/httpd/branches/2.4.x/modules/cluster/Makefile.in (props changed) httpd/httpd/branches/2.4.x/modules/cluster/mod_heartbeat.c (props changed) httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c (props changed) httpd/httpd/branches/2.4.x/modules/filters/NWGNUreflector (props changed) httpd/httpd/branches/2.4.x/modules/filters/mod_data.c (props changed) httpd/httpd/branches/2.4.x/modules/filters/mod_data.dsp (contents, props changed) httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c (props changed) httpd/httpd/branches/2.4.x/modules/filters/mod_ratelimit.c (props changed) httpd/httpd/branches/2.4.x/modules/filters/mod_ratelimit.h (props changed) httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c (props changed) httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.h (props changed) httpd/httpd/branches/2.4.x/modules/lua/Makefile.in (props changed) httpd/httpd/branches/2.4.x/modules/lua/test/htdocs/find_me.txt (props changed) httpd/httpd/branches/2.4.x/modules/lua/test/htdocs/test.lua (props changed) httpd/httpd/branches/2.4.x/modules/lua/test/test_httpd.conf (props changed) httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fdpass.c (props changed) httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fdpass.h (props changed) httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.h (props changed) httpd/httpd/branches/2.4.x/modules/test/mod_dialup.c (props changed) httpd/httpd/branches/2.4.x/test/make_sni.sh (contents, props changed) Modified: httpd/httpd/branches/2.4.x/build/NWGNUscripts.inc URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/NWGNUscripts.inc?rev=1309579&r1=1309578&r2=1309579&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/build/NWGNUscripts.inc (original) +++ httpd/httpd/branches/2.4.x/build/NWGNUscripts.inc Wed Apr 4 20:11:57 2012 @@ -1,43 +1,43 @@ -# Include for creating start/stop/restart NCF scripts. - -instscripts:: FORCE $(INSTALLBASE)/ap2start.ncf $(INSTALLBASE)/ap2auto.ncf $(INSTALLBASE)/ap2rest.ncf $(INSTALLBASE)/ap2stop.ncf - -$(INSTALLBASE)/ap2start.ncf: - @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@ - @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@ - @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@ - @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@ - @echo $(DL)load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@ - @echo $(DL)# If you have problems with 3rd-party modules try to load in OS space.$(DL)>> $@ - @echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@ - @$(ECHONL)>> $@ - -$(INSTALLBASE)/ap2auto.ncf: - @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@ - @echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@ - @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@ - @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@ - @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@ - @echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@ - @$(ECHONL)>> $@ - -$(INSTALLBASE)/ap2rest.ncf: - @echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@ - @echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@ - @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@ - @echo $(DL)# apache2 restart$(DL)>> $@ - @$(ECHONL)>> $@ - -$(INSTALLBASE)/ap2stop.ncf: - @echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@ - @echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@ - @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@ - @echo $(DL)# apache2 shutdown$(DL)>> $@ - @$(ECHONL)>> $@ - -$(INSTALLBASE)/ap2prod.ncf: - @echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@ - @echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@ - @echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@ - @$(ECHONL)>> $@ - +# Include for creating start/stop/restart NCF scripts. + +instscripts:: FORCE $(INSTALLBASE)/ap2start.ncf $(INSTALLBASE)/ap2auto.ncf $(INSTALLBASE)/ap2rest.ncf $(INSTALLBASE)/ap2stop.ncf + +$(INSTALLBASE)/ap2start.ncf: + @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@ + @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@ + @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@ + @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@ + @echo $(DL)load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@ + @echo $(DL)# If you have problems with 3rd-party modules try to load in OS space.$(DL)>> $@ + @echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@ + @$(ECHONL)>> $@ + +$(INSTALLBASE)/ap2auto.ncf: + @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@ + @echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@ + @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@ + @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@ + @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@ + @echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@ + @$(ECHONL)>> $@ + +$(INSTALLBASE)/ap2rest.ncf: + @echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@ + @echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@ + @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@ + @echo $(DL)# apache2 restart$(DL)>> $@ + @$(ECHONL)>> $@ + +$(INSTALLBASE)/ap2stop.ncf: + @echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@ + @echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@ + @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@ + @echo $(DL)# apache2 shutdown$(DL)>> $@ + @$(ECHONL)>> $@ + +$(INSTALLBASE)/ap2prod.ncf: + @echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@ + @echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@ + @echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@ + @$(ECHONL)>> $@ + Propchange: httpd/httpd/branches/2.4.x/build/NWGNUscripts.inc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/build/aix/README ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/build/aix/aixinfo ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/build/aix/aixproto.ksh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/build/aix/buildaix.ksh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/build/aix/mkinstallp.ksh ------------------------------------------------------------------------------ svn:eol-style = native Modified: httpd/httpd/branches/2.4.x/build/mkdep.perl URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/mkdep.perl?rev=1309579&r1=1309578&r2=1309579&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/build/mkdep.perl (original) +++ httpd/httpd/branches/2.4.x/build/mkdep.perl Wed Apr 4 20:11:57 2012 @@ -1,7 +1,5 @@ #!/usr/bin/perl # -# $Id$ -# # Created: Thu Aug 15 11:57:33 1996 too # Last modified: Mon Dec 27 09:23:56 1999 too # Propchange: httpd/httpd/branches/2.4.x/build/mkdep.perl ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_lua.html.fr ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_lua.xml.fr ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.html.fr ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.xml.fr ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.html.fr ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml.fr ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/avoid.html.fr ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/avoid.xml.fr ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/htaccess.html.fr ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/htaccess.xml.fr ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/include/apache_noprobes.h ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/include/apache_noprobes.h ('svn:mime-type' removed) Propchange: httpd/httpd/branches/2.4.x/modules/arch/unix/Makefile.in ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/modules/cluster/Makefile.in ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/modules/cluster/mod_heartbeat.c ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/modules/cluster/mod_heartbeat.c ('svn:mime-type' removed) Propchange: httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c ('svn:mime-type' removed) Propchange: httpd/httpd/branches/2.4.x/modules/filters/NWGNUreflector ('svn:eol' removed) Propchange: httpd/httpd/branches/2.4.x/modules/filters/mod_data.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_data.dsp URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_data.dsp?rev=1309579&r1=1309578&r2=1309579&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/filters/mod_data.dsp (original) +++ httpd/httpd/branches/2.4.x/modules/filters/mod_data.dsp Wed Apr 4 20:11:57 2012 @@ -1,111 +1,111 @@ -# Microsoft Developer Studio Project File - Name="mod_data" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_data - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_data.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_data.mak" CFG="mod_data - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_data - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_data - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_data - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_ZUTIL_H" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_data_src" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /fo"Release/mod_data.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_data.so" /d LONG_NAME="buffer_module for Apache" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:".\Release\mod_data.so" /base:@..\..\os\win32\BaseAddr.ref,mod_data.so -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_data.so" /base:@..\..\os\win32\BaseAddr.ref,mod_data.so /opt:ref -# Begin Special Build Tool -TargetPath=.\Release\mod_data.so -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 -# End Special Build Tool - -!ELSEIF "$(CFG)" == "mod_data - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_ZUTIL_H" /Fd"Debug\mod_data_src" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /fo"Debug/mod_data.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_data.so" /d LONG_NAME="buffer_module for Apache" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_data.so" /base:@..\..\os\win32\BaseAddr.ref,mod_data.so -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_data.so" /base:@..\..\os\win32\BaseAddr.ref,mod_data.so -# Begin Special Build Tool -TargetPath=.\Debug\mod_data.so -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "mod_data - Win32 Release" -# Name "mod_data - Win32 Debug" -# Begin Source File - -SOURCE=.\mod_data.c -# End Source File -# Begin Source File - -SOURCE=..\..\build\win32\httpd.rc -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="mod_data" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=mod_data - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "mod_data.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "mod_data.mak" CFG="mod_data - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "mod_data - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_data - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "mod_data - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_ZUTIL_H" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_data_src" /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /fo"Release/mod_data.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_data.so" /d LONG_NAME="buffer_module for Apache" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:".\Release\mod_data.so" /base:@..\..\os\win32\BaseAddr.ref,mod_data.so +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_data.so" /base:@..\..\os\win32\BaseAddr.ref,mod_data.so /opt:ref +# Begin Special Build Tool +TargetPath=.\Release\mod_data.so +SOURCE="$(InputPath)" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +# End Special Build Tool + +!ELSEIF "$(CFG)" == "mod_data - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_ZUTIL_H" /Fd"Debug\mod_data_src" /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /fo"Debug/mod_data.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_data.so" /d LONG_NAME="buffer_module for Apache" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_data.so" /base:@..\..\os\win32\BaseAddr.ref,mod_data.so +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_data.so" /base:@..\..\os\win32\BaseAddr.ref,mod_data.so +# Begin Special Build Tool +TargetPath=.\Debug\mod_data.so +SOURCE="$(InputPath)" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "mod_data - Win32 Release" +# Name "mod_data - Win32 Debug" +# Begin Source File + +SOURCE=.\mod_data.c +# End Source File +# Begin Source File + +SOURCE=..\..\build\win32\httpd.rc +# End Source File +# End Target +# End Project Propchange: httpd/httpd/branches/2.4.x/modules/filters/mod_data.dsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/modules/filters/mod_ratelimit.c ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/modules/filters/mod_ratelimit.c ('svn:mime-type' removed) Propchange: httpd/httpd/branches/2.4.x/modules/filters/mod_ratelimit.h ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/modules/filters/mod_ratelimit.h ('svn:mime-type' removed) Propchange: httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/modules/lua/Makefile.in ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/modules/lua/test/htdocs/find_me.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/modules/lua/test/htdocs/test.lua ('svn:executable' removed) Propchange: httpd/httpd/branches/2.4.x/modules/lua/test/test_httpd.conf ('svn:executable' removed) Propchange: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fdpass.c ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fdpass.c ('svn:mime-type' removed) Propchange: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fdpass.h ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fdpass.h ('svn:mime-type' removed) Propchange: httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpd/httpd/branches/2.4.x/modules/test/mod_dialup.c ('svn:keywords' removed) Propchange: httpd/httpd/branches/2.4.x/modules/test/mod_dialup.c ('svn:mime-type' removed) Modified: httpd/httpd/branches/2.4.x/test/make_sni.sh URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/make_sni.sh?rev=1309579&r1=1309578&r2=1309579&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/test/make_sni.sh (original) +++ httpd/httpd/branches/2.4.x/test/make_sni.sh Wed Apr 4 20:11:57 2012 @@ -19,8 +19,6 @@ # and certificates as to facilitate testing of TLS server name # indication support (RFC 4366) or SNI. # -# $Id$ -# # OPENSSL=${OPENSSL:-openssl} DOMAIN=${DOMAIN:-my-sni-test.org} Propchange: httpd/httpd/branches/2.4.x/test/make_sni.sh ('svn:keywords' removed)