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

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index 22bd63f67802703f8f4508a2e292adee18ba7a46..3cbbac4c861502535f3ac7361e558ee3b5b68e5d 100644 (file)
--- 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 ed92084a8d63e69a2d7c2e04eadb9b2cef8d8cab..2ec65abf97583903c4d5e403fd6f2ef53e27e0b3 100644 (file)
--- 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 9dd71176b6389c11c697026bbb2c347a706cbb4a..9fa06bd5326a39d5624bb0470d1b1a6a6eafd70c 100644 (file)
--- 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 dd4ab102f2acecb4aaeae0c306ec47842d42838a..8cd26d8de957bf336473c26fd4ebeb781cfa5b97 100644 (file)
--- 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 8873c94d770d9b0537123fb9dfc453396a3a3f96..2f52eb15336b8dc38d8eeb7f6e6cec7f0320d31a 100644 (file)
--- 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