fix various property issues

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1309567 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/NWGNUscripts.inc b/build/NWGNUscripts.inc
index 7b0aa0d7093ec4ecb74387cc968633446e413467..27029ebb744207f50b3ed9235e94440aed82e689 100644 (file)
--- a/build/NWGNUscripts.inc
+++ b/build/NWGNUscripts.inc
@@ -1,43 +1,43 @@
-# Include for creating start/stop/restart NCF scripts.\r
-\r
-instscripts:: FORCE $(INSTALLBASE)/ap2start.ncf $(INSTALLBASE)/ap2auto.ncf $(INSTALLBASE)/ap2rest.ncf $(INSTALLBASE)/ap2stop.ncf\r
-\r
-$(INSTALLBASE)/ap2start.ncf:\r
-       @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@\r
-       @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@\r
-       @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@\r
-       @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@\r
-       @echo $(DL)load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
-       @echo $(DL)# If you have problems with 3rd-party modules try to load in OS space.$(DL)>> $@\r
-       @echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
-       @$(ECHONL)>> $@\r
-\r
-$(INSTALLBASE)/ap2auto.ncf:\r
-       @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@\r
-       @echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@\r
-       @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@\r
-       @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@\r
-       @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@\r
-       @echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
-       @$(ECHONL)>> $@\r
-\r
-$(INSTALLBASE)/ap2rest.ncf:\r
-       @echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@\r
-       @echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@\r
-       @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@\r
-       @echo $(DL)# apache2 restart$(DL)>> $@\r
-       @$(ECHONL)>> $@\r
-\r
-$(INSTALLBASE)/ap2stop.ncf:\r
-       @echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@\r
-       @echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@\r
-       @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@\r
-       @echo $(DL)# apache2 shutdown$(DL)>> $@\r
-       @$(ECHONL)>> $@\r
-\r
-$(INSTALLBASE)/ap2prod.ncf:\r
-       @echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@\r
-       @echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@\r
-       @echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@\r
-       @$(ECHONL)>> $@\r
-\r
+# 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)>> $@
+

diff --git a/build/mkdep.perl b/build/mkdep.perl
index 10815d2483628bc18cc7d392248e20876217f13e..7f776d8553c858d5dcac1c9f515fe5574c1839d8 100644 (file)
--- a/build/mkdep.perl
+++ b/build/mkdep.perl
@@ -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
 #

diff --git a/docs/manual/mod/mod_cache_socache.xml b/docs/manual/mod/mod_cache_socache.xml
index 5450137f6658040c578e8b221aa665a3add6d9e2..ff04e7d61eb07e0bf59f36893fd1c4e938f27d91 100644 (file)
--- a/docs/manual/mod/mod_cache_socache.xml
+++ b/docs/manual/mod/mod_cache_socache.xml
@@ -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

diff --git a/modules/filters/mod_data.dsp b/modules/filters/mod_data.dsp
index e7270312564900fc2af24edd854690c1aed885fc..00aad10be680ad87e8487ec84fd7c5aaefe20890 100644 (file)
--- a/modules/filters/mod_data.dsp
+++ b/modules/filters/mod_data.dsp
@@ -1,111 +1,111 @@
-# Microsoft Developer Studio Project File - Name="mod_data" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=mod_data - Win32 Release\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "mod_data.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "mod_data.mak" CFG="mod_data - Win32 Release"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "mod_data - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "mod_data - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "mod_data - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_ZUTIL_H" /FD /c\r
-# 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\r
-# ADD BASE MTL /nologo /D "NDEBUG" /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# 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"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:".\Release\mod_data.so" /base:@..\..\os\win32\BaseAddr.ref,mod_data.so\r
-# 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\r
-# Begin Special Build Tool\r
-TargetPath=.\Release\mod_data.so\r
-SOURCE="$(InputPath)"\r
-PostBuild_Desc=Embed .manifest\r
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2\r
-# End Special Build Tool\r
-\r
-!ELSEIF  "$(CFG)" == "mod_data - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c\r
-# 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\r
-# ADD BASE MTL /nologo /D "_DEBUG" /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# 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"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# 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\r
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_data.so" /base:@..\..\os\win32\BaseAddr.ref,mod_data.so\r
-# Begin Special Build Tool\r
-TargetPath=.\Debug\mod_data.so\r
-SOURCE="$(InputPath)"\r
-PostBuild_Desc=Embed .manifest\r
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2\r
-# End Special Build Tool\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "mod_data - Win32 Release"\r
-# Name "mod_data - Win32 Debug"\r
-# Begin Source File\r
-\r
-SOURCE=.\mod_data.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\build\win32\httpd.rc\r
-# End Source File\r
-# End Target\r
-# End Project\r
+# 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

diff --git a/modules/lua/test/htdocs/test.lua b/modules/lua/test/htdocs/test.lua
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/modules/lua/test/test_httpd.conf b/modules/lua/test/test_httpd.conf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/test/make_sni.sh b/test/make_sni.sh
index c12ad31cda07f39004d3a95f53927225072ba192..e76d2da702831c6f716216aa6bf36bd566c3ef47 100644 (file)
--- a/test/make_sni.sh
+++ b/test/make_sni.sh
@@ -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}