You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2009/09/27 14:17:12 UTC
svn commit: r819292 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
docs/manual/mod/mod_mime.xml modules/http/mod_mime.c
Author: minfrin
Date: Sun Sep 27 12:17:12 2009
New Revision: 819292
URL: http://svn.apache.org/viewvc?rev=819292&view=rev
Log:
...and promote.
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml
httpd/httpd/branches/2.2.x/modules/http/mod_mime.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=819292&r1=819291&r2=819292&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sun Sep 27 12:17:12 2009
@@ -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]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=819292&r1=819291&r2=819292&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Sep 27 12:17:12 2009
@@ -87,12 +87,6 @@
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 ]
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml?rev=819292&r1=819291&r2=819292&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml Sun Sep 27 12:17:12 2009
@@ -598,6 +598,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/branches/2.2.x/modules/http/mod_mime.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/http/mod_mime.c?rev=819292&r1=819291&r2=819292&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/http/mod_mime.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/mod_mime.c Sun Sep 27 12:17:12 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)) {