From: Jim Jagielski <jim@apache.org>
Date: Tue, 30 Apr 2013 14:12:52 +0000 (+0000)
Subject: ipromote
X-Git-Tag: 2.4.5~349
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c5fdd36ffff5b3bcc2ad58e9e574e9e8900397e;p=apache

ipromote


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

diff --git a/STATUS b/STATUS
index f57afa1c76..a22aa26f2c 100644
--- a/STATUS
+++ b/STATUS
@@ -90,11 +90,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_proxy: Allow balancers and ProxyPass to be server-specific, as
      they should have been. Inheritance causes too many behind-the-scene
      interactions to be reliable in a dynamic environ. We maintain the
@@ -115,6 +110,30 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
             say "(Setting to Off recommended if using the Balancer Manager)"?
      minfrin: +1 (including http://svn.apache.org/r1476680 as per rjung)
 
+    * htpasswd: Add -v option
+      trunk patches: https://svn.apache.org/r1465116
+      2.4.x patch: trunk patches work
+      +1: sf, minfrin, jim
+
+    * mod_cache_socache: New cache implementation backed by mod_socache
+      that replaces mod_mem_cache removed from httpd v2.2.
+      trunk patches: http://svn.apache.org/r1305167
+                     http://svn.apache.org/r1330964
+                     http://svn.apache.org/r1388660
+                     http://svn.apache.org/r1388899
+                     http://svn.apache.org/r1391396
+                     http://svn.apache.org/r1391398
+                     http://svn.apache.org/r1392214
+                     http://svn.apache.org/r1406760
+                     http://svn.apache.org/r1418648
+      2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache_socache-rollup.patch
+      +1: minfrin, gsmith, jim
+
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+
   * mod_ssl: add support for subjectAltName-based host name checking
     in proxy mode (PR 54030)
     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=r1425874
@@ -206,11 +225,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk patches work
       +1: jim
 
-    * htpasswd: Add -v option
-      trunk patches: https://svn.apache.org/r1465116
-      2.4.x patch: trunk patches work
-      +1: sf, minfrin, jim
-
     * mod_dav: Make sure that when we prepare an If URL for Etag comparison,     
       we compare unencoded paths. PR 53910
       trunk patch: http://svn.apache.org/r1470940
@@ -252,20 +266,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk patch works (minus CHANGES)
       +1: minfrin
 
-    * mod_cache_socache: New cache implementation backed by mod_socache
-      that replaces mod_mem_cache removed from httpd v2.2.
-      trunk patches: http://svn.apache.org/r1305167
-                     http://svn.apache.org/r1330964
-                     http://svn.apache.org/r1388660
-                     http://svn.apache.org/r1388899
-                     http://svn.apache.org/r1391396
-                     http://svn.apache.org/r1391398
-                     http://svn.apache.org/r1392214
-                     http://svn.apache.org/r1406760
-                     http://svn.apache.org/r1418648
-      2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache_socache-rollup.patch
-      +1: minfrin, gsmith, jim
-
     * core, mod_ssl: Lift the restriction that prevents mod_ssl taking
       full advantage of the event MPM. Enable the ability for a module
       to reverse the sense of a poll event from a read to a write or vice