You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by po...@apache.org on 2009/09/14 18:32:30 UTC
svn commit: r814728 - in /httpd/httpd/trunk: CHANGES
docs/manual/mod/mod_mime.xml modules/http/mod_mime.c
Author: poirier
Date: Mon Sep 14 16:32:30 2009
New Revision: 814728
URL: http://svn.apache.org/viewvc?rev=814728&view=rev
Log:
mod_mime: detect invalid use of MultiviewsMatch inside Location and
LocationMatch sections. Document that such usage is not valid.
PR47754.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/docs/manual/mod/mod_mime.xml
httpd/httpd/trunk/modules/http/mod_mime.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=814728&r1=814727&r2=814728&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Sep 14 16:32:30 2009
@@ -2,6 +2,9 @@
Changes with Apache 2.3.3
+ *) mod_mime: Detect invalid use of MultiviewsMatch inside Location and
+ LocationMatch sections. PR47754. [Dan Poirier]
+
*) mod_request: Make sure the KeptBodySize directive rejects values
that aren't valid numbers. [Graham Leggett]
Modified: httpd/httpd/trunk/docs/manual/mod/mod_mime.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_mime.xml?rev=814728&r1=814727&r2=814728&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_mime.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_mime.xml Mon Sep 14 16:32:30 2009
@@ -608,6 +608,11 @@
<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>
Modified: httpd/httpd/trunk/modules/http/mod_mime.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/mod_mime.c?rev=814728&r1=814727&r2=814728&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/mod_mime.c (original)
+++ httpd/httpd/trunk/modules/http/mod_mime.c Mon Sep 14 16:32:30 2009
@@ -312,6 +312,12 @@
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)) {