From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 12 Jul 2010 09:24:23 +0000 (+0000)
Subject: * Promote
X-Git-Tag: 2.2.16~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fe554edba950d1193ea8dc9ed1aba9e8a4b3dc1;p=thirdparty%2Fapache%2Fhttpd.git

* Promote

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

diff --git a/STATUS b/STATUS
index 8131bcaf24d..43025272e80 100644
--- a/STATUS
+++ b/STATUS
@@ -114,6 +114,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
            option in the docs page, like e.g. we did for SSLInsecureRenegotiation.
     wrowe asks; you mean <Compatibility> tag?  Yes, of course.
 
+  * mod_dir: Fix NULL pointer dereference if FallBackResource is not configured
+      Trunk version of patch:
+         http://svn.apache.org/viewcvs.cgi?rev=785457&view=rev
+      Backport version for 2.2.x of patch:
+         Trunk version of patch works
+      +1: rpluem, niq, rjung
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -216,13 +223,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2.x: http://people.apache.org/~niq/patches/46594.patch
      +1: niq
 
-  * mod_dir: Fix NULL pointer dereference if FallBackResource is not configured
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=785457&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, niq, rjung
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of