add apreq in Win32

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

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index 4250ae08e821d8c1eb7251b342a24c9606e54375..7e9047569098a4ab0d5b9ba3ec35ee0fa747f4ba 100644 (file)
--- a/Apache-apr2.dsw
+++ b/Apache-apr2.dsw
@@ -87,6 +87,9 @@ Package=<4>
     Project_Dep_Name httpd
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_apreq
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name ApacheMonitor
     End Project Dependency
     Begin Project Dependency
@@ -741,6 +744,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "libapreq"=.\libapreq.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libapriconv
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "libhttpd"=.\libhttpd.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/Apache.dsw b/Apache.dsw
index 781f53fd378d0ff26aa141218c7b048d22345ad1..8e580a778014cb36ab311561c57980efc7cf5c29 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -90,6 +90,9 @@ Package=<4>
     Project_Dep_Name httpd
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_apreq
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name ApacheMonitor
     End Project Dependency
     Begin Project Dependency
@@ -900,6 +903,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "libapreq"=.\libapreq.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libapriconv
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "libhttpd"=.\libhttpd.dsp - Package Owner=<4>
 
 Package=<5>
@@ -1026,7 +1053,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_asis"=.\modules\generators\mod_asis.dsp - Package Owner=<4>
+Project: "mod_apreq"=.\modules\apreq\mod_apreq.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1043,8 +1070,31 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libapreq
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_asis"=.\modules\generators\mod_asis.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
 }}}
 
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
 
 ###############################################################################
 

diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index b1a46f1b87590a5e7a239db31f076285fba43873..c3b8f070d85adeac57a647bc1bf264acaeb27852 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -99,6 +99,7 @@ BEGIN {
           print "LoadModule alias_module modules/mod_alias.so" > dstfl;
           print "#LoadModule allowhandlers_module modules/mod_allowhandlers.so" > dstfl;
           print "#LoadModule allowmethods_module modules/mod_allowmethods.so" > dstfl;
+          print "#LoadModule apreq_module modules/mod_apreq.so" > dstfl;
           print "LoadModule asis_module modules/mod_asis.so" > dstfl;
           print "LoadModule auth_basic_module modules/mod_auth_basic.so" > dstfl;
           print "#LoadModule auth_digest_module modules/mod_auth_digest.so" > dstfl;

diff --git a/libapreq.dsp b/libapreq.dsp
new file mode 100644 (file)
index 0000000..a4fb37f
--- /dev/null
+++ b/libapreq.dsp
@@ -0,0 +1,200 @@
+# Microsoft Developer Studio Project File - Name="libapreq" - 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=libapreq - 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 "libapreq.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 "libapreq.mak" CFG="libapreq - Win32 Release"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "libapreq - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "libapreq - 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)" == "libapreq - 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 "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /D "APREQ_DECLARE_EXPORT" /FD /c\r
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /D "APREQ_DECLARE_EXPORT" /Fd"Release\libapreq_cl" /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/libapreq.res" /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d BIN_NAME="libapreq.dll" /d LONG_NAME="libapreq"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /machine:IX86\r
+# ADD LINK32 pcre.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /libpath:"./srclib/pcre" /base:@"os\win32\BaseAddr.ref",libapreq.dll /opt:ref\r
+# Begin Special Build Tool\r
+TargetPath=.\Release\libapreq.dll\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)" == "libapreq - 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 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS"/D "AP_DECLARE_EXPORT" /D "APREQ_DECLARE_EXPORT"  /FD /EHsc /c\r
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /D "APREQ_DECLARE_EXPORT" /Fd"Debug\libapreq_cl" /FD /EHsc /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/libapreq.res" /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d BIN_NAME="libapreq.dll" /d LONG_NAME="libapreq"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:IX86\r
+# ADD LINK32 pcred.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:IX86 /libpath:"./srclib/pcre" /base:@"os\win32\BaseAddr.ref",libapreq.dll\r
+# Begin Special Build Tool\r
+TargetPath=.\Debug\libapreq.dll\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 "libapreq - Win32 Release"\r
+# Name "libapreq - Win32 Debug"\r
+# Begin Group "headers"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"\r
+# Begin Source File\r
+\r
+SOURCE=.\include\ap_config.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\ap_release.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\apreq.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\apreq_cookie.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\apreq_error.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\apreq_module.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\apreq_param.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\apreq_parser.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\apreq_util.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "libapreq"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\server\apreq_cookie.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\apreq_error.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\apreq_module.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\apreq_module_cgi.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\apreq_module_custom.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\apreq_param.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\apreq_parser.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\apreq_parser_header.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\apreq_parser_multipart.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\apreq_parser_urlencoded.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\apreq_util.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\buildmark.c\r
+# PROP Exclude_From_Build 1\r
+# End Source File\r
+# End Group\r
+# Begin Source File\r
+\r
+SOURCE=.\build\win32\httpd.rc\r
+# End Source File\r
+# End Target\r
+# End Project\r

diff --git a/modules/apreq/mod_apreq.dsp b/modules/apreq/mod_apreq.dsp
new file mode 100644 (file)
index 0000000..d6fffa2
--- /dev/null
+++ b/modules/apreq/mod_apreq.dsp
@@ -0,0 +1,115 @@
+# Microsoft Developer Studio Project File - Name="mod_apreq" - 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_apreq - Win32 Debug
+!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_apreq.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_apreq.mak" CFG="mod_apreq - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mod_apreq - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_apreq - 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_apreq - 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 "APREQ_DECLARE_EXPORT" /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" /D "APREQ_DECLARE_EXPORT" /Fd"Release\mod_apreq_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/mod_apreq.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_apreq.so" /d LONG_NAME="apreq_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_apreq.so" /base:@..\..\os\win32\BaseAddr.ref,mod_apreq.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_apreq.so" /base:@..\..\os\win32\BaseAddr.ref,mod_apreq.so /opt:ref
+# Begin Special Build Tool
+TargetPath=.\Release\mod_apreq.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_apreq - 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" /D "APREQ_DECLARE_EXPORT" /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 "APREQ_DECLARE_EXPORT" /Fd"Debug\mod_apreq_src" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/mod_apreq.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_apreq.so" /d LONG_NAME="apreq_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_apreq.so" /base:@..\..\os\win32\BaseAddr.ref,mod_apreq.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_apreq.so" /base:@..\..\os\win32\BaseAddr.ref,mod_apreq.so
+# Begin Special Build Tool
+TargetPath=.\Debug\mod_apreq.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_apreq - Win32 Release"
+# Name "mod_apreq - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\filter.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\handle.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\httpd.rc
+# End Source File
+# End Target
+# End Project

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 4f66745aeb3300876e432d9392c753ab7a430871..b591fbf167b0e813e2fcbf95b1f17f85cb27b6bc 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -138,4 +138,5 @@ mod_brotli.so               0x70D30000    0x000C0000
 mod_proxy_hcheck.so         0x70DF0000    0x00020000
 mod_socache_redis.so        0x70E10000    0x00020000
 mod_md.so                   0x70E30000    0x00030000
-mod_proxy_uwsgi.so          0x70E60000    0x00020000
\ No newline at end of file
+mod_proxy_uwsgi.so          0x70E60000    0x00020000
+libapreq.dll                0x70E80000    0x00020000