...and promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@819292 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 34b8f35d707e8bcb8287dba3d242567b980642cd..a9a34def353ad8d0148c0159c911051aaeb6d722 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.15
 
+  *) mod_mime: Detect invalid use of MultiviewsMatch inside Location and
+     LocationMatch sections.  PR47754. [Dan Poirier]
+
   *) ab, mod_ssl: restore compatibility with OpenSSL < 0.9.7g which we broke
      with r801527 (backport r819242, r819245). Reported on the list by Jie
      Gao. [Guenter Knauf]

diff --git a/STATUS b/STATUS
index 7644e3b882286f7c674f73ebff1c7c124a2debef..2867961d8395f70eed6cd5ed90dfd18e293bdbb9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -87,12 +87,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_mime: Detect invalid use of MultiviewsMatch inside Location and
-   LocationMatch sections.  
-   PR47754.
-   Trunk Patch: https://svn.apache.org/viewcvs.cgi?view=rev&rev=814728
-   2.2.x Patch: http://people.apache.org/~poirier/PR47754-2.2.x-patch.txt
-   +1: poirier, rpluem, minfrin
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/docs/manual/mod/mod_mime.xml b/docs/manual/mod/mod_mime.xml
index 6f20a3bb2e7fba10ef00a5abb8a984a6735d30d4..7d4ccd79216a312d3adef6b70b348bb270f66afd 100644 (file)
--- a/docs/manual/mod/mod_mime.xml
+++ b/docs/manual/mod/mod_mime.xml
@@ -598,6 +598,11 @@ a matching file with MultiViews</description>
     <example>
       MultiviewsMatch Handlers Filters
     </example>
+
+    <p><directive>MultiviewsMatch</directive> is not allowed in a
+    <directive type="section" module="core">Location</directive> or <directive
+    type="section" module="core">LocationMatch</directive> section.</p>
+
 </usage>
 <seealso><directive module="core">Options</directive></seealso>
 <seealso><module>mod_negotiation</module></seealso>

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index d9d8b101711d51e71d0eef3570fca3577316dd96..a801a0ca1d4a83f48e10d0ab62cac5828419cf1a 100644 (file)
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -312,6 +312,12 @@ static const char *multiviews_match(cmd_parms *cmd, void *m_,
                                     const char *include)
 {
     mime_dir_config *m = (mime_dir_config *) m_;
+    const char *errmsg;
+
+    errmsg = ap_check_cmd_context(cmd, NOT_IN_LOCATION);
+    if (errmsg != NULL) {
+        return errmsg;
+    }
 
     if (strcasecmp(include, "Any") == 0) {
         if (m->multimatch && (m->multimatch & ~MULTIMATCH_ANY)) {