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 2018/02/26 18:36:16 UTC
svn commit: r1825396 - in /httpd/httpd/trunk: Apache-apr2.dsw Apache.dsw
build/installwinconf.awk libapreq.dsp modules/apreq/mod_apreq.dsp
os/win32/BaseAddr.ref
Author: gsmith
Date: Mon Feb 26 18:36:15 2018
New Revision: 1825396
URL: http://svn.apache.org/viewvc?rev=1825396&view=rev
Log:
add apreq in Win32
Added:
httpd/httpd/trunk/libapreq.dsp
httpd/httpd/trunk/modules/apreq/mod_apreq.dsp (with props)
Modified:
httpd/httpd/trunk/Apache-apr2.dsw
httpd/httpd/trunk/Apache.dsw
httpd/httpd/trunk/build/installwinconf.awk
httpd/httpd/trunk/os/win32/BaseAddr.ref
Modified: httpd/httpd/trunk/Apache-apr2.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache-apr2.dsw?rev=1825396&r1=1825395&r2=1825396&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache-apr2.dsw (original)
+++ httpd/httpd/trunk/Apache-apr2.dsw Mon Feb 26 18:36:15 2018
@@ -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
@@ -739,6 +742,27 @@ Package=<4>
End Project Dependency
}}}
+###############################################################################
+
+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>
Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=1825396&r1=1825395&r2=1825396&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Mon Feb 26 18:36:15 2018
@@ -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
+}}}
###############################################################################
Modified: httpd/httpd/trunk/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/installwinconf.awk?rev=1825396&r1=1825395&r2=1825396&view=diff
==============================================================================
--- httpd/httpd/trunk/build/installwinconf.awk (original)
+++ httpd/httpd/trunk/build/installwinconf.awk Mon Feb 26 18:36:15 2018
@@ -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;
Added: httpd/httpd/trunk/libapreq.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/libapreq.dsp?rev=1825396&view=auto
==============================================================================
--- httpd/httpd/trunk/libapreq.dsp (added)
+++ httpd/httpd/trunk/libapreq.dsp Mon Feb 26 18:36:15 2018
@@ -0,0 +1,200 @@
+# Microsoft Developer Studio Project File - Name="libapreq" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libapreq - 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 "libapreq.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 "libapreq.mak" CFG="libapreq - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libapreq - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libapreq - 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)" == "libapreq - 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 "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /D "APREQ_DECLARE_EXPORT" /FD /c
+# 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
+# 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/libapreq.res" /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d BIN_NAME="libapreq.dll" /d LONG_NAME="libapreq"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /machine:IX86
+# 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
+# Begin Special Build Tool
+TargetPath=.\Release\libapreq.dll
+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)" == "libapreq - 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 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS"/D "AP_DECLARE_EXPORT" /D "APREQ_DECLARE_EXPORT" /FD /EHsc /c
+# 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
+# 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/libapreq.res" /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d BIN_NAME="libapreq.dll" /d LONG_NAME="libapreq"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:IX86
+# 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
+# Begin Special Build Tool
+TargetPath=.\Debug\libapreq.dll
+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 "libapreq - Win32 Release"
+# Name "libapreq - Win32 Debug"
+# Begin Group "headers"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=.\include\ap_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\ap_release.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apreq.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apreq_cookie.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apreq_error.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apreq_module.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apreq_param.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apreq_parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apreq_util.h
+# End Source File
+# End Group
+# Begin Group "libapreq"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\server\apreq_cookie.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\apreq_error.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\apreq_module.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\apreq_module_cgi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\apreq_module_custom.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\apreq_param.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\apreq_parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\apreq_parser_header.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\apreq_parser_multipart.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\apreq_parser_urlencoded.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\apreq_util.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\buildmark.c
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\build\win32\httpd.rc
+# End Source File
+# End Target
+# End Project
Added: httpd/httpd/trunk/modules/apreq/mod_apreq.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/apreq/mod_apreq.dsp?rev=1825396&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/apreq/mod_apreq.dsp (added)
+++ httpd/httpd/trunk/modules/apreq/mod_apreq.dsp Mon Feb 26 18:36:15 2018
@@ -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
Propchange: httpd/httpd/trunk/modules/apreq/mod_apreq.dsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/trunk/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/BaseAddr.ref?rev=1825396&r1=1825395&r2=1825396&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/trunk/os/win32/BaseAddr.ref Mon Feb 26 18:36:15 2018
@@ -138,4 +138,5 @@ mod_brotli.so 0x70D30000
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