You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2012/04/04 21:49:27 UTC
svn commit: r1309567 - in /httpd/httpd/trunk: build/ build/aix/
docs/manual/faq/ docs/manual/images/ docs/manual/mod/ include/
modules/arch/unix/ modules/cluster/ modules/debugging/ modules/filters/
modules/lua/ modules/lua/test/ modules/lua/test/htdoc...
Author: nd
Date: Wed Apr 4 19:49:25 2012
New Revision: 1309567
URL: http://svn.apache.org/viewvc?rev=1309567&view=rev
Log:
fix various property issues
Modified:
httpd/httpd/trunk/build/NWGNUscripts.inc (contents, props changed)
httpd/httpd/trunk/build/aix/README (props changed)
httpd/httpd/trunk/build/aix/aixinfo (props changed)
httpd/httpd/trunk/build/aix/aixproto.ksh (props changed)
httpd/httpd/trunk/build/aix/buildaix.ksh (props changed)
httpd/httpd/trunk/build/aix/mkinstallp.ksh (props changed)
httpd/httpd/trunk/build/mkdep.perl (contents, props changed)
httpd/httpd/trunk/docs/manual/faq/index.html.ko.euc-kr (props changed)
httpd/httpd/trunk/docs/manual/faq/index.xml.ko (props changed)
httpd/httpd/trunk/docs/manual/images/compliance-reverse-proxy.png (props changed)
httpd/httpd/trunk/docs/manual/images/compliance-static.png (props changed)
httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html (props changed)
httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html.en (props changed)
httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml (contents, props changed)
httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml.meta (props changed)
httpd/httpd/trunk/docs/manual/mod/mod_lua.html.fr (props changed)
httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr (props changed)
httpd/httpd/trunk/include/apache_noprobes.h (props changed)
httpd/httpd/trunk/modules/arch/unix/Makefile.in (props changed)
httpd/httpd/trunk/modules/cluster/Makefile.in (props changed)
httpd/httpd/trunk/modules/cluster/mod_heartbeat.c (props changed)
httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c (props changed)
httpd/httpd/trunk/modules/debugging/mod_firehose.c (props changed)
httpd/httpd/trunk/modules/filters/NWGNUreflector (props changed)
httpd/httpd/trunk/modules/filters/mod_data.c (props changed)
httpd/httpd/trunk/modules/filters/mod_data.dsp (contents, props changed)
httpd/httpd/trunk/modules/filters/mod_proxy_html.c (props changed)
httpd/httpd/trunk/modules/filters/mod_ratelimit.c (props changed)
httpd/httpd/trunk/modules/filters/mod_ratelimit.h (props changed)
httpd/httpd/trunk/modules/filters/mod_xml2enc.c (props changed)
httpd/httpd/trunk/modules/filters/mod_xml2enc.h (props changed)
httpd/httpd/trunk/modules/lua/Makefile.in (props changed)
httpd/httpd/trunk/modules/lua/test/htdocs/find_me.txt (props changed)
httpd/httpd/trunk/modules/lua/test/htdocs/test.lua (props changed)
httpd/httpd/trunk/modules/lua/test/test_httpd.conf (props changed)
httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c (props changed)
httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.h (props changed)
httpd/httpd/trunk/modules/proxy/mod_serf.h (props changed)
httpd/httpd/trunk/modules/proxy/proxy_util.h (props changed)
httpd/httpd/trunk/modules/test/mod_dialup.c (props changed)
httpd/httpd/trunk/modules/test/mod_policy.c (props changed)
httpd/httpd/trunk/server/mpm/simple/Makefile.in (props changed)
httpd/httpd/trunk/server/mpm/simple/simple_api.c (props changed)
httpd/httpd/trunk/server/mpm/simple/simple_children.c (props changed)
httpd/httpd/trunk/server/mpm/simple/simple_children.h (props changed)
httpd/httpd/trunk/server/mpm/simple/simple_core.c (props changed)
httpd/httpd/trunk/server/mpm/simple/simple_event.c (props changed)
httpd/httpd/trunk/server/mpm/simple/simple_event.h (props changed)
httpd/httpd/trunk/server/mpm/simple/simple_io.c (props changed)
httpd/httpd/trunk/server/mpm/simple/simple_io.h (props changed)
httpd/httpd/trunk/server/mpm/simple/simple_run.c (props changed)
httpd/httpd/trunk/server/mpm/simple/simple_run.h (props changed)
httpd/httpd/trunk/server/mpm/simple/simple_types.h (props changed)
httpd/httpd/trunk/support/firehose.c (props changed)
httpd/httpd/trunk/test/make_sni.sh (contents, props changed)
Modified: httpd/httpd/trunk/build/NWGNUscripts.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUscripts.inc?rev=1309567&r1=1309566&r2=1309567&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUscripts.inc (original)
+++ httpd/httpd/trunk/build/NWGNUscripts.inc Wed Apr 4 19:49:25 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/trunk/build/NWGNUscripts.inc
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/build/aix/README
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/build/aix/aixinfo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/build/aix/aixproto.ksh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/build/aix/buildaix.ksh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/build/aix/mkinstallp.ksh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/trunk/build/mkdep.perl
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/mkdep.perl?rev=1309567&r1=1309566&r2=1309567&view=diff
==============================================================================
--- httpd/httpd/trunk/build/mkdep.perl (original)
+++ httpd/httpd/trunk/build/mkdep.perl Wed Apr 4 19:49:25 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/trunk/build/mkdep.perl
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/docs/manual/faq/index.html.ko.euc-kr
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/docs/manual/faq/index.xml.ko
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/docs/manual/images/compliance-reverse-proxy.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Apr 4 19:49:25 2012
@@ -1 +1 @@
-application/octet-stream
+image/png
Propchange: httpd/httpd/trunk/docs/manual/images/compliance-static.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Apr 4 19:49:25 2012
@@ -1 +1 @@
-application/octet-stream
+image/png
Propchange: httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html.en
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml?rev=1309567&r1=1309566&r2=1309567&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml Wed Apr 4 19:49:25 2012
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- $LastChangedRevision: 1174747 $ -->
+<!-- $LastChangedRevision$ -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Propchange: httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml
------------------------------------------------------------------------------
svn:keywords = LastChangedRevision
Propchange: httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml.meta
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/docs/manual/mod/mod_lua.html.fr
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/include/apache_noprobes.h
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/include/apache_noprobes.h
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/modules/arch/unix/Makefile.in
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/modules/cluster/Makefile.in
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/modules/debugging/mod_firehose.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/modules/filters/NWGNUreflector
('svn:eol' removed)
Propchange: httpd/httpd/trunk/modules/filters/mod_data.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/trunk/modules/filters/mod_data.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_data.dsp?rev=1309567&r1=1309566&r2=1309567&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_data.dsp (original)
+++ httpd/httpd/trunk/modules/filters/mod_data.dsp Wed Apr 4 19:49:25 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/trunk/modules/filters/mod_data.dsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/modules/filters/mod_proxy_html.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/modules/filters/mod_ratelimit.c
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/modules/filters/mod_ratelimit.c
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/modules/filters/mod_ratelimit.h
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/modules/filters/mod_ratelimit.h
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/modules/filters/mod_xml2enc.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/modules/filters/mod_xml2enc.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/modules/lua/Makefile.in
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/modules/lua/test/htdocs/find_me.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/modules/lua/test/htdocs/test.lua
('svn:executable' removed)
Propchange: httpd/httpd/trunk/modules/lua/test/test_httpd.conf
('svn:executable' removed)
Propchange: httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.h
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.h
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/modules/proxy/mod_serf.h
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/modules/proxy/mod_serf.h
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/modules/proxy/proxy_util.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/modules/test/mod_dialup.c
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/modules/test/mod_dialup.c
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/modules/test/mod_policy.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/trunk/server/mpm/simple/Makefile.in
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_api.c
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_api.c
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_children.c
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_children.c
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_children.h
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_children.h
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_core.c
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_core.c
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_event.c
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_event.c
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_event.h
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_event.h
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_io.c
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_io.c
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_io.h
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_io.h
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_run.c
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_run.c
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_run.h
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_run.h
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_types.h
('svn:keywords' removed)
Propchange: httpd/httpd/trunk/server/mpm/simple/simple_types.h
('svn:mime-type' removed)
Propchange: httpd/httpd/trunk/support/firehose.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/trunk/test/make_sni.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/make_sni.sh?rev=1309567&r1=1309566&r2=1309567&view=diff
==============================================================================
--- httpd/httpd/trunk/test/make_sni.sh (original)
+++ httpd/httpd/trunk/test/make_sni.sh Wed Apr 4 19:49:25 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/trunk/test/make_sni.sh
('svn:keywords' removed)