From: Eric Covener <covener@apache.org>
Date: Mon, 8 Aug 2011 02:37:15 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.20~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b08f7e7b1275758f6b4783b554e316b9275ef5a2;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index ba6cd2c0791..6ea0fff0c6f 100644
--- a/STATUS
+++ b/STATUS
@@ -102,6 +102,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.2.x patch: http://people.apache.org/~rjung/patches/mod_filter-cgi-err_headers_out.patch
     +1: rjung, jorton, sf
 
+  * Sort hooks before running pre-config hook.
+    Trunk patch: http://svn.apache.org/viewvc?rev=1032002&view=rev
+      (Omit trunk's config*m4 change which adjusted the order of statically
+      linked modules.)
+    PR: 45076
+    2.2.x patch: http://people.apache.org/~trawick/1032002-2.2.x.txt
+    +1: trawick, sf, covener
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -115,14 +122,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     trawick: any reason it shouldn't be completely aligned with default_handler's
              choice to return OK vs. 500?
 
-  * Sort hooks before running pre-config hook.
-    Trunk patch: http://svn.apache.org/viewvc?rev=1032002&view=rev
-      (Omit trunk's config*m4 change which adjusted the order of statically
-      linked modules.)
-    PR: 45076
-    2.2.x patch: http://people.apache.org/~trawick/1032002-2.2.x.txt
-    +1: trawick, sf, covener
-
   * Adjust inflated log severity.
     PR: 44020
     Trunk patch: Was never in trunk.