From f92d0f3a0ba3a3e51cfb2132930035dcb148f51a Mon Sep 17 00:00:00 2001 From: Gregg Lewis Smith Date: Sat, 19 Nov 2011 00:36:47 +0000 Subject: [PATCH] backport r1203924 from trunk git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1203925 13f79535-47bb-0310-9956-ffa450edef68 --- Apache-apr2.dsw | 21 +++++++++++++++++++++ Apache.dsw | 24 ++++++++++++++++++++++++ Makefile.win | 2 ++ build/installwinconf.awk | 1 + os/win32/BaseAddr.ref | 1 + 5 files changed, 49 insertions(+) diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw index 22bd63f678..3cbbac4c86 100644 --- a/Apache-apr2.dsw +++ b/Apache-apr2.dsw @@ -96,6 +96,9 @@ Package=<4> Project_Dep_Name mod_alias End Project Dependency Begin Project Dependency + Project_Dep_Name mod_allowmethods + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_asis End Project Dependency Begin Project Dependency @@ -786,6 +789,24 @@ Package=<4> ############################################################################### +Project: "mod_allowmethods"=.\modules\aaa\mod_allowmethods.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_asis"=.\modules\generators\mod_asis.dsp - Package Owner=<4> Package=<5> diff --git a/Apache.dsw b/Apache.dsw index ed92084a8d..2ec65abf97 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -111,6 +111,9 @@ Package=<4> Project_Dep_Name mod_alias End Project Dependency Begin Project Dependency + Project_Dep_Name mod_allowmethods + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_asis End Project Dependency Begin Project Dependency @@ -960,6 +963,27 @@ Package=<4> ############################################################################### +Project: "mod_allowmethods"=.\modules\aaa\mod_allowmethods.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_asis"=.\modules\generators\mod_asis.dsp - Package Owner=<4> Package=<5> diff --git a/Makefile.win b/Makefile.win index 9dd71176b6..9fa06bd532 100644 --- a/Makefile.win +++ b/Makefile.win @@ -382,6 +382,7 @@ _build: cd ..\.. cd modules\aaa $(MAKE) $(MAKEOPT) -f mod_access_compat.mak CFG="mod_access_compat - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_allowmethods.mak CFG="mod_allowmethods - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_auth_basic.mak CFG="mod_auth_basic - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_auth_form.mak CFG="mod_auth_form - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -666,6 +667,7 @@ _copybin: ) copy srclib\pcre\pcre.$(src_dll) "$(inst_dll)" <.y copy modules\aaa\$(LONG)\mod_access_compat.$(src_so) "$(inst_so)" <.y + copy modules\aaa\$(LONG)\mod_allowmethods.$(src_so) "$(inst_so)" <.y copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) "$(inst_so)" <.y copy modules\aaa\$(LONG)\mod_auth_digest.$(src_so) "$(inst_so)" <.y copy modules\aaa\$(LONG)\mod_auth_form.$(src_so) "$(inst_so)" <.y diff --git a/build/installwinconf.awk b/build/installwinconf.awk index dd4ab102f2..8cd26d8de9 100644 --- a/build/installwinconf.awk +++ b/build/installwinconf.awk @@ -95,6 +95,7 @@ BEGIN { print "LoadModule access_compat_module modules/mod_access_compat.so" > dstfl; print "LoadModule actions_module modules/mod_actions.so" > dstfl; print "LoadModule alias_module modules/mod_alias.so" > dstfl; + print "LoadModule allowmethods_module modules/mod_allowmethods.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/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index 8873c94d77..2f52eb1533 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -117,3 +117,4 @@ mod_log_debug.so 0x6F750000 0x00010000 mod_proxy_html.so 0x6F740000 0x00010000 mod_xml2enc.so 0x6F730000 0x00010000 mod_data.so 0x6F720000 0x00010000 +mod_allowmethods 0x6F710000 0x00010000 -- 2.40.0