From: Jim Jagielski <jim@apache.org>
Date: Wed, 26 Jun 2013 12:59:31 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.5~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a07987eb5ec682f27b4f96196f59700e720fc487;p=apache

promote


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

diff --git a/STATUS b/STATUS
index 9fce05a224..9e3b77497d 100644
--- a/STATUS
+++ b/STATUS
@@ -91,6 +91,18 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
+    on Linux kernel versions 3.x and above.  (PR 55121)
+    trunk patch: http://svn.apache.org/r1496429
+    2.4.x patch: trunk patch works modulo CHANGES
+    +1: trawick, jorton, jim
+
+  * mod_cache: Fix new const warnings
+    (cache_storage.c:581:13: warning: passing argument 1 of 'ap_strrchr' discards 'const' qualifier from pointer target type)
+    trunk patch: http://svn.apache.org/r1491564
+    2.4.x patch: trunk patch works
+    +1: trawick, jorton, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -214,18 +226,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              time when we can just fix the underlying problem instead.
          jj: Agree w/ minfrin
 
-  * core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
-    on Linux kernel versions 3.x and above.  (PR 55121)
-    trunk patch: http://svn.apache.org/r1496429
-    2.4.x patch: trunk patch works modulo CHANGES
-    +1: trawick, jorton, jim
-
-  * mod_cache: Fix new const warnings
-    (cache_storage.c:581:13: warning: passing argument 1 of 'ap_strrchr' discards 'const' qualifier from pointer target type)
-    trunk patch: http://svn.apache.org/r1491564
-    2.4.x patch: trunk patch works
-    +1: trawick, jorton, jim
-
 A list of further possible backports can be found at:                                                                                                                                   
     http://people.apache.org/~rjung/patches/possible-backports-httpd-trunk-2_4.txt
 If you want to propose one of those, please still add them here.