diff options
| -rw-r--r-- | Apache.dsw | 48 | ||||
| -rw-r--r-- | Makefile.win | 6 | ||||
| -rw-r--r-- | build/installwinconf.awk | 2 | ||||
| -rw-r--r-- | os/win32/BaseAddr.ref | 2 |
4 files changed, 58 insertions, 0 deletions
diff --git a/Apache.dsw b/Apache.dsw index 74752b3f75..656fabece3 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -312,6 +312,12 @@ Package=<4> Project_Dep_Name mod_setenvif End Project Dependency Begin Project Dependency + Project_Dep_Name mod_slotmem_plain + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_slotmem_shm + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_socache_dbm End Project Dependency Begin Project Dependency @@ -2858,6 +2864,48 @@ Package=<4> ############################################################################### +Project: "mod_slotmem_plain"=.\modules\slotmem\mod_slotmem_plain.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 +}}} + +############################################################################### + +Project: "mod_slotmem_shm"=.\modules\slotmem\mod_slotmem_shm.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 +}}} + +############################################################################### + Project: "mod_socache_dbm"=.\modules\cache\mod_socache_dbm.dsp - Package Owner=<4> Package=<5> diff --git a/Makefile.win b/Makefile.win index 5e4cdc6673..d577a741bc 100644 --- a/Makefile.win +++ b/Makefile.win @@ -508,6 +508,10 @@ _build: $(MAKE) $(MAKEOPT) -f mod_session_cookie.mak CFG="mod_session_cookie - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_session_dbd.mak CFG="mod_session_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. + cd modules\slotmem + $(MAKE) $(MAKEOPT) -f mod_slotmem_plain.mak CFG="mod_slotmem_plain - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_slotmem_shm.mak CFG="mod_slotmem_shm - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. !IF EXIST("srclib\openssl") # cd modules\session # $(MAKE) $(MAKEOPT) -f mod_session_crypto.mak CFG="mod_session_crypto - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -736,6 +740,8 @@ _copybin: copy modules\session\$(LONG)\mod_session.$(src_so) "$(inst_so)" <.y copy modules\session\$(LONG)\mod_session_cookie.$(src_so) "$(inst_so)" <.y copy modules\session\$(LONG)\mod_session_dbd.$(src_so) "$(inst_so)" <.y + copy modules\slotmem\$(LONG)\mod_slotmem_plain.$(src_so) "$(inst_so)" <.y + copy modules\slotmem\$(LONG)\mod_slotmem_shm.$(src_so) "$(inst_so)" <.y !IF EXIST("srclib\openssl") # copy modules\session\$(LONG)\mod_session_crypto.$(src_so) "$(inst_so)" <.y copy modules\ssl\$(LONG)\mod_ssl.$(src_so) "$(inst_so)" <.y diff --git a/build/installwinconf.awk b/build/installwinconf.awk index 565428d9d1..3c03d01fa7 100644 --- a/build/installwinconf.awk +++ b/build/installwinconf.awk @@ -153,6 +153,8 @@ BEGIN { print "#LoadModule reflector_module modules/mod_reflector.so" > dstfl; print "#LoadModule rewrite_module modules/mod_rewrite.so" > dstfl; print "LoadModule setenvif_module modules/mod_setenvif.so" > dstfl; + print "#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so" > dstfl; + print "#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so" > dstfl; print "#LoadModule speling_module modules/mod_speling.so" > dstfl; print "#LoadModule ssl_module modules/mod_ssl.so" > dstfl; print "#LoadModule status_module modules/mod_status.so" > dstfl; diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index b69b9e7ec9..07a1ebcf8d 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -110,3 +110,5 @@ mod_proxy_scgi.so 0x6F7C0000 0x00010000 mod_serf.so 0x6F7B0000 0x00010000 mod_reqtimeout.so 0x6F7A0000 0x00010000 mod_reflector.so 0x6F790000 0x00010000 +mod_slotmem_plain.so 0x6F780000 0x00010000 +mod_slotmem_shm.so 0x6F770000 0x00010000 |