diff options
| -rw-r--r-- | Apache-apr2.dsw | 72 | ||||
| -rw-r--r-- | Apache.dsw | 72 | ||||
| -rw-r--r-- | Makefile.win | 6 | ||||
| -rw-r--r-- | build/installwinconf.awk | 3 | ||||
| -rw-r--r-- | os/win32/BaseAddr.ref | 3 |
5 files changed, 156 insertions, 0 deletions
diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw index da7e9225ba..50d67e3358 100644 --- a/Apache-apr2.dsw +++ b/Apache-apr2.dsw @@ -123,6 +123,9 @@ Package=<4> Project_Dep_Name mod_authn_file End Project Dependency Begin Project Dependency + Project_Dep_Name mod_authn_socache + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_authnz_ldap End Project Dependency Begin Project Dependency @@ -231,6 +234,9 @@ Package=<4> Project_Dep_Name mod_log_config End Project Dependency Begin Project Dependency + Project_Dep_Name mod_log_debug + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_log_forensic End Project Dependency Begin Project Dependency @@ -255,6 +261,9 @@ Package=<4> Project_Dep_Name mod_proxy_connect End Project Dependency Begin Project Dependency + Project_Dep_Name mod_proxy_express + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_proxy_fcgi End Project Dependency Begin Project Dependency @@ -973,6 +982,27 @@ Package=<4> ############################################################################### +Project: "mod_authn_socache"=.\modules\aaa\mod_authn_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 +}}} + +############################################################################### + Project: "mod_authnz_ldap"=.\modules\aaa\mod_authnz_ldap.dsp - Package Owner=<4> Package=<5> @@ -1909,6 +1939,24 @@ Package=<4> ############################################################################### +Project: "mod_log_debug"=.\modules\loggers\mod_log_debug.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 +}}} + +############################################################################### + Project: "mod_log_forensic"=.\modules\loggers\mod_log_forensic.dsp - Package Owner=<4> Package=<5> @@ -2098,6 +2146,30 @@ Package=<4> ############################################################################### +Project: "mod_proxy_express"=.\modules\proxy\mod_proxy_express.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_proxy + End Project Dependency +}}} + +############################################################################### + Project: "mod_proxy_fcgi"=.\modules\proxy\mod_proxy_fcgi.dsp - Package Owner=<4> Package=<5> diff --git a/Apache.dsw b/Apache.dsw index 093b366aa4..3920da62f4 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -138,6 +138,9 @@ Package=<4> Project_Dep_Name mod_authn_file End Project Dependency Begin Project Dependency + Project_Dep_Name mod_authn_socache + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_authnz_ldap End Project Dependency Begin Project Dependency @@ -246,6 +249,9 @@ Package=<4> Project_Dep_Name mod_log_config End Project Dependency Begin Project Dependency + Project_Dep_Name mod_log_debug + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_log_forensic End Project Dependency Begin Project Dependency @@ -270,6 +276,9 @@ Package=<4> Project_Dep_Name mod_proxy_connect End Project Dependency Begin Project Dependency + Project_Dep_Name mod_proxy_express + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_proxy_fcgi End Project Dependency Begin Project Dependency @@ -1177,6 +1186,27 @@ Package=<4> ############################################################################### +Project: "mod_authn_socache"=.\modules\aaa\mod_authn_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 +}}} + +############################################################################### + Project: "mod_authnz_ldap"=.\modules\aaa\mod_authnz_ldap.dsp - Package Owner=<4> Package=<5> @@ -2257,6 +2287,24 @@ Package=<4> ############################################################################### +Project: "mod_log_debug"=.\modules\loggers\mod_log_debug.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 +}}} + +############################################################################### + Project: "mod_log_forensic"=.\modules\loggers\mod_log_forensic.dsp - Package Owner=<4> Package=<5> @@ -2476,6 +2524,30 @@ Package=<4> ############################################################################### +Project: "mod_proxy_express"=.\modules\proxy\mod_proxy_express.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_proxy + End Project Dependency +}}} + +############################################################################### + Project: "mod_proxy_fcgi"=.\modules\proxy\mod_proxy_fcgi.dsp - Package Owner=<4> Package=<5> diff --git a/Makefile.win b/Makefile.win index 7ba2eec92c..bac5221822 100644 --- a/Makefile.win +++ b/Makefile.win @@ -387,6 +387,7 @@ _build: $(MAKE) $(MAKEOPT) -f mod_authn_dbd.mak CFG="mod_authn_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_authn_dbm.mak CFG="mod_authn_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_authn_file.mak CFG="mod_authn_file - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_authn_socache.mak CFG="mod_authn_socache - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_authnz_ldap.mak CFG="mod_authnz_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_authz_core.mak CFG="mod_authz_core - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_authz_dbd.mak CFG="mod_authz_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -471,6 +472,7 @@ _build: cd ..\.. cd modules\loggers $(MAKE) $(MAKEOPT) -f mod_log_config.mak CFG="mod_log_config - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_log_debug.mak CFG="mod_log_debug - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_log_forensic.mak CFG="mod_log_forensic - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_logio.mak CFG="mod_logio - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. @@ -508,6 +510,7 @@ _build: $(MAKE) $(MAKEOPT) -f mod_proxy_ajp.mak CFG="mod_proxy_ajp - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_proxy_balancer.mak CFG="mod_proxy_balancer - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_proxy_connect.mak CFG="mod_proxy_connect - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_proxy_express.mak CFG="mod_proxy_express - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_proxy_fcgi.mak CFG="mod_proxy_fcgi - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_proxy_ftp.mak CFG="mod_proxy_ftp - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_proxy_http.mak CFG="mod_proxy_http - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -659,6 +662,7 @@ _copybin: copy modules\aaa\$(LONG)\mod_authn_dbd.$(src_so) "$(inst_so)" <.y copy modules\aaa\$(LONG)\mod_authn_dbm.$(src_so) "$(inst_so)" <.y copy modules\aaa\$(LONG)\mod_authn_file.$(src_so) "$(inst_so)" <.y + copy modules\aaa\$(LONG)\mod_authn_socache.$(src_so) "$(inst_so)" <.y copy modules\aaa\$(LONG)\mod_authnz_ldap.$(src_so) "$(inst_so)" <.y copy modules\aaa\$(LONG)\mod_authz_core.$(src_so) "$(inst_so)" <.y copy modules\aaa\$(LONG)\mod_authz_dbd.$(src_so) "$(inst_so)" <.y @@ -719,6 +723,7 @@ _copybin: copy modules\http\$(LONG)\mod_mime.$(src_so) "$(inst_so)" <.y copy modules\ldap\$(LONG)\mod_ldap.$(src_so) "$(inst_so)" <.y copy modules\loggers\$(LONG)\mod_log_config.$(src_so) "$(inst_so)" <.y + copy modules\loggers\$(LONG)\mod_log_debug.$(src_so) "$(inst_so)" <.y copy modules\loggers\$(LONG)\mod_log_forensic.$(src_so) "$(inst_so)" <.y copy modules\loggers\$(LONG)\mod_logio.$(src_so) "$(inst_so)" <.y !IF EXIST("srclib\lua") @@ -751,6 +756,7 @@ _copybin: copy modules\proxy\$(LONG)\mod_proxy_ajp.$(src_so) "$(inst_so)" <.y copy modules\proxy\$(LONG)\mod_proxy_balancer.$(src_so) "$(inst_so)" <.y copy modules\proxy\$(LONG)\mod_proxy_connect.$(src_so) "$(inst_so)" <.y + copy modules\proxy\$(LONG)\mod_proxy_express.$(src_so) "$(inst_so)" <.y copy modules\proxy\$(LONG)\mod_proxy_fcgi.$(src_so) "$(inst_so)" <.y copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so) "$(inst_so)" <.y copy modules\proxy\$(LONG)\mod_proxy_http.$(src_so) "$(inst_so)" <.y diff --git a/build/installwinconf.awk b/build/installwinconf.awk index 3c03d01fa7..ebb339d7b8 100644 --- a/build/installwinconf.awk +++ b/build/installwinconf.awk @@ -102,6 +102,7 @@ BEGIN { print "#LoadModule authn_dbd_module modules/mod_authn_dbd.so" > dstfl; print "#LoadModule authn_dbm_module modules/mod_authn_dbm.so" > dstfl; print "LoadModule authn_file_module modules/mod_authn_file.so" > dstfl; + print "#LoadModule authn_socache_module modules/mod_authn_socache.so" > dstfl; print "#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so" > dstfl; print "LoadModule authz_core_module modules/mod_authz_core.so" > dstfl; print "#LoadModule authz_dbd_module modules/mod_authz_dbd.so" > dstfl; @@ -137,6 +138,7 @@ BEGIN { print "#LoadModule ldap_module modules/mod_ldap.so" > dstfl; print "#LoadModule logio_module modules/mod_logio.so" > dstfl; print "LoadModule log_config_module modules/mod_log_config.so" > dstfl; + print "#LoadModule log_debug_module modules/mod_log_debug.so" > dstfl; print "#LoadModule log_forensic_module modules/mod_log_forensic.so" > dstfl; print "LoadModule mime_module modules/mod_mime.so" > dstfl; print "#LoadModule mime_magic_module modules/mod_mime_magic.so" > dstfl; @@ -145,6 +147,7 @@ BEGIN { print "#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so" > dstfl; print "#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so" > dstfl; print "#LoadModule proxy_connect_module modules/mod_proxy_connect.so" > dstfl; + print "#LoadModule proxy_express_module modules/mod_proxy_express.so" > dstfl; print "#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so" > dstfl; print "#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so" > dstfl; print "#LoadModule proxy_http_module modules/mod_proxy_http.so" > dstfl; diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index 07a1ebcf8d..1564fa1de2 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -112,3 +112,6 @@ mod_reqtimeout.so 0x6F7A0000 0x00010000 mod_reflector.so 0x6F790000 0x00010000 mod_slotmem_plain.so 0x6F780000 0x00010000 mod_slotmem_shm.so 0x6F770000 0x00010000 +mod_authn_socache.so 0x6F760000 0x00010000 +mod_proxy_express.so 0x6F750000 0x00010000 +mod_log_debug.so 0x6F740000 0x00010000 |