From: Graham Leggett <minfrin@apache.org>
Date: Sun, 27 Sep 2009 12:06:32 +0000 (+0000)
Subject: Vote...
X-Git-Tag: 2.2.15~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43b65ece7e6a658e2754acd80da15901106a5250;p=thirdparty%2Fapache%2Fhttpd.git

Vote...


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

diff --git a/STATUS b/STATUS
index 2b6b4c538f1..7644e3b8822 100644
--- a/STATUS
+++ b/STATUS
@@ -87,6 +87,12 @@ 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 ]
@@ -107,13 +113,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    2.2.x Patch: http://people.apache.org/~minfrin/ssl-env.diff
    +1: minfrin
 
- * 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
-
  * mod_rewrite: Add scgi scheme detection. /me completely forgot, that
    mod_rewrite was extended for this as well...
    Trunk Patch: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?r1=728220&r2=729538