vote, promote

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

diff --git a/STATUS b/STATUS
index 3c3be27018797c1d5d2d745683a23bf981a65c9f..eec7b319c08a4baf1dca3c21d113a98fa6843ee1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -79,6 +79,28 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_proxy: Fix persistent backend connections.
+     PR 43472
+     Trunk version of patch:
+        http://svn.apache.org/viewcvs.cgi?rev=580466&view=rev
+     Backport version for 2.2.x of patch:
+        Trunk version of patch works
+     +1: rpluem, niq, trawick
+
+   * scoreboard: improve error message on apr_shm_create failure
+     PR 40037
+     http://svn.apache.org/viewvc?view=rev&revision=578620
+     +1: niq, rpluem, trawick
+
+   * mod_proxy: Don't by default violate RFC2616 by setting
+     Max-Forwards when the client didn't send it to us.
+     PR 16137
+     http://svn.apache.org/viewvc?view=rev&revision=581117 (code)
+     http://svn.apache.org/viewvc?view=rev&revision=581253 (docs)
+     +1: niq, rpluem, trawick (who assumes that the "/2.3" in "default
+         behaviour changed in 2.2.7/2.3" will be stripped from trunk 
+         and 2.2.x as part of the backport operation)
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -190,19 +212,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      they close stdout/stderr first and dup a then closed fd in stdout/stderr,
      leaving us without stdout/stderr in the child.
 
-   * mod_proxy: Fix persistent backend connections.
-     PR 43472
-     Trunk version of patch:
-        http://svn.apache.org/viewcvs.cgi?rev=580466&view=rev
-     Backport version for 2.2.x of patch:
-        Trunk version of patch works
-     +1: rpluem, niq
-
-   * scoreboard: improve error message on apr_shm_create failure
-     PR 40037
-     http://svn.apache.org/viewvc?view=rev&revision=578620
-     +1: niq, rpluem
-
    * HTTP protocol: Add "DefaultType none" option.
      PR 13986 and PR 16139
      http://svn.apache.org/viewvc?view=rev&revision=579991 (code)
@@ -240,13 +249,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      niq: changed the name.  Resisted temptation to use "pooltabletime".
      rpluem says: Revision of name change is r581030.
 
-   * mod_proxy: Don't by default violate RFC2616 by setting
-     Max-Forwards when the client didn't send it to us.
-     PR 16137
-     http://svn.apache.org/viewvc?view=rev&revision=581117 (code)
-     http://svn.apache.org/viewvc?view=rev&revision=581253 (docs)
-     +1: niq, rpluem
-
 PATCHES/ISSUES THAT ARE STALLED
 
     * mod_ldap, mod_authnzldap: Add support for nested groups (i.e. the ability