From: Jim Jagielski <jim@apache.org>
Date: Fri, 27 Apr 2012 13:06:05 +0000 (+0000)
Subject: p[romote
X-Git-Tag: 2.4.3~526
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f592a296ec8b3e04833a51c888a13a3147b9e7b;p=apache

p[romote


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

diff --git a/STATUS b/STATUS
index 8e4cdd9057..b2bbd25655 100644
--- a/STATUS
+++ b/STATUS
@@ -88,16 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
-  * mod_rewrite: Fix RewriteCond integer checks to be parsed correctly.
-    (PR 53023)
-    Patch: http://svn.apache.org/viewvc?view=revision&revision=1309602
-    (applies cleanly to 2.4.x)
-    +1: nd
-
   * mod_proxy_fcgi: Report errors to the client
     PR: 52879
     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1311172
@@ -113,13 +103,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4 patch: Trunk patch works
     +1: sf, jorton, jim
 
-  * mod_authz_core: Fix parsing of Require arguments in <AuthzProviderAlias>.
-    Add some logging and an assert for a case that should not happen.
-    PR: 53048
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1311183
-    2.4 patch: Trunk patch works
-    +1: sf
-
   * mod_lua: Log better error message if parsing of a script fails (including
     the line number of a syntax error!).
     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1305586
@@ -131,6 +114,22 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4 patch: Trunk patch works
     +1: sf, jorton, jim
 
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+  * mod_rewrite: Fix RewriteCond integer checks to be parsed correctly.
+    (PR 53023)
+    Patch: http://svn.apache.org/viewvc?view=revision&revision=1309602
+    (applies cleanly to 2.4.x)
+    +1: nd
+
+  * mod_authz_core: Fix parsing of Require arguments in <AuthzProviderAlias>.
+    Add some logging and an assert for a case that should not happen.
+    PR: 53048
+    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1311183
+    2.4 patch: Trunk patch works
+    +1: sf
+
   * log_server_status: Bring Perl style forward to the present, use
     standard modules, update for new format of server-status output.
     Trunk patch: http://people.apache.org/~rbowen/log_server_status.trunk.patch