diff options
| -rw-r--r-- | Apache-apr2.dsw | 24 | ||||
| -rw-r--r-- | Apache.dsw | 27 | ||||
| -rw-r--r-- | Makefile.win | 2 | ||||
| -rw-r--r-- | build/installwinconf.awk | 1 | ||||
| -rw-r--r-- | modules/cache/mod_cache_socache.dsp | 115 | ||||
| -rw-r--r-- | os/win32/BaseAddr.ref | 1 |
6 files changed, 170 insertions, 0 deletions
diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw index 678183d190..502caea0f2 100644 --- a/Apache-apr2.dsw +++ b/Apache-apr2.dsw @@ -162,6 +162,9 @@ Package=<4> Project_Dep_Name mod_cache_disk End Project Dependency Begin Project Dependency + Project_Dep_Name mod_cache_socache + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_cern_meta End Project Dependency Begin Project Dependency @@ -1510,6 +1513,27 @@ Package=<4> ############################################################################### +Project: "mod_cache_socache"=.\modules\cache\mod_cache_socache.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libapr + End Project Dependency + Begin Project Dependency + Project_Dep_Name libhttpd + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_cache + End Project Dependency +}}} + +############################################################################### + Project: "mod_dumpio"=.\modules\debugging\mod_dumpio.dsp - Package Owner=<4> Package=<5> diff --git a/Apache.dsw b/Apache.dsw index ab4deaff14..c7c6081760 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -177,6 +177,9 @@ Package=<4> Project_Dep_Name mod_cache_disk End Project Dependency Begin Project Dependency + Project_Dep_Name mod_cache_socache + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_cern_meta End Project Dependency Begin Project Dependency @@ -1795,6 +1798,30 @@ Package=<4> ############################################################################### +Project: "mod_cache_socache"=.\modules\cache\mod_cache_socache.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 + Begin Project Dependency + Project_Dep_Name mod_cache + End Project Dependency +}}} + +############################################################################### + Project: "mod_dumpio"=.\modules\debugging\mod_dumpio.dsp - Package Owner=<4> Package=<5> diff --git a/Makefile.win b/Makefile.win index 21418ff4a4..ecc0734f03 100644 --- a/Makefile.win +++ b/Makefile.win @@ -433,6 +433,7 @@ _build: cd modules\cache $(MAKE) $(MAKEOPT) -f mod_cache.mak CFG="mod_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_cache_disk.mak CFG="mod_cache_disk - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_cache_socache.mak CFG="mod_cache_socache - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_file_cache.mak CFG="mod_file_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_socache_dbm.mak CFG="mod_socache_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET) # $(MAKE) $(MAKEOPT) -f mod_socache_dc.mak CFG="mod_socache_dc - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -721,6 +722,7 @@ _copybin: copy modules\arch\win32\$(LONG)\mod_isapi.$(src_so) "$(inst_so)" <.y copy modules\cache\$(LONG)\mod_cache.$(src_so) "$(inst_so)" <.y copy modules\cache\$(LONG)\mod_cache_disk.$(src_so) "$(inst_so)" <.y + copy modules\cache\$(LONG)\mod_cache_socache.$(src_so) "$(inst_so)" <.y copy modules\cache\$(LONG)\mod_file_cache.$(src_so) "$(inst_so)" <.y copy modules\cache\$(LONG)\mod_socache_dbm.$(src_so) "$(inst_so)" <.y # copy modules\cache\$(LONG)\mod_socache_dc.$(src_so) "$(inst_so)" <.y diff --git a/build/installwinconf.awk b/build/installwinconf.awk index 60f784eabb..dd81076933 100644 --- a/build/installwinconf.awk +++ b/build/installwinconf.awk @@ -118,6 +118,7 @@ BEGIN { print "#LoadModule buffer_module modules/mod_buffer.so" > dstfl; print "#LoadModule cache_module modules/mod_cache.so" > dstfl; print "#LoadModule cache_disk_module modules/mod_cache_disk.so" > dstfl; + print "#LoadModule cache_socache_module modules/mod_cache_socache.so" > dstfl; print "#LoadModule cern_meta_module modules/mod_cern_meta.so" > dstfl; print "LoadModule cgi_module modules/mod_cgi.so" > dstfl; print "#LoadModule charset_lite_module modules/mod_charset_lite.so" > dstfl; diff --git a/modules/cache/mod_cache_socache.dsp b/modules/cache/mod_cache_socache.dsp new file mode 100644 index 0000000000..e5d582e219 --- /dev/null +++ b/modules/cache/mod_cache_socache.dsp @@ -0,0 +1,115 @@ +# Microsoft Developer Studio Project File - Name="mod_cache_socache" - 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_cache_socache - 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_cache_socache.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_cache_socache.mak" CFG="mod_cache_socache - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "mod_cache_socache - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_cache_socache - 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_cache_socache - 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" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fd"Release\mod_cache_socache_src" /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /fo"Release/mod_cache_socache.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_cache_socache.so" /d LONG_NAME="cache_socache_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 +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_cache_socache.so" /base:@..\..\os\win32\BaseAddr.ref,mod_cache_socache.so /opt:ref +# Begin Special Build Tool +TargetPath=.\Release\mod_cache_socache.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_cache_socache - 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 "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fd"Debug\mod_cache_socache_src" /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /fo"Debug/mod_cache_socache.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_cache_socache.so" /d LONG_NAME="cache_socache_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 +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_cache_socache.so" /base:@..\..\os\win32\BaseAddr.ref,mod_cache_socache.so +# Begin Special Build Tool +TargetPath=.\Debug\mod_cache_socache.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_cache_socache - Win32 Release" +# Name "mod_cache_socache - Win32 Debug" +# Begin Source File + +SOURCE=.\mod_cache.h +# End Source File +# Begin Source File + +SOURCE=.\mod_cache_socache.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 bb3acc12ba..47293bd1c3 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -119,3 +119,4 @@ mod_proxy_html.so 0x6F730000 0x00010000 mod_xml2enc.so 0x6F720000 0x00010000 mod_data.so 0x6F710000 0x00010000 mod_allowmethods.so 0x6F700000 0x00010000 +mod_cache_socache.so 0x6F6F0000 0x00010000 |