vote and promote

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

diff --git a/STATUS b/STATUS
index 00824d4b7e18618ac3e2336d36f69312282539d4..f070f8ac81a726bdf79daa8fe5d5eeb15c459ca9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,6 +90,21 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * mod_proxy: Allow for keepalive backend proxies (PR43238), which also
+   addresses PR44026 and PR44543. These are pretty much interwrapped here.
+    Trunk version of patch:
+      http://svn.apache.org/viewvc?view=rev&revision=602542
+      http://svn.apache.org/viewvc?view=rev&revision=603237
+      http://svn.apache.org/viewvc?view=rev&revision=603502
+      http://svn.apache.org/viewvc?view=rev&revision=603543
+      http://svn.apache.org/viewvc?view=rev&revision=604447
+      http://svn.apache.org/viewvc?view=rev&revision=604449
+      http://svn.apache.org/viewvc?view=rev&revision=605314
+      http://svn.apache.org/viewvc?view=rev&revision=605838
+    Backport version for 2.2.x of patch:
+      http://people.apache.org/~rpluem/patches/proxy-ssl-44026-patch.txt
+   +1: jim, rpluem, fielding
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -151,21 +166,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    http://svn.apache.org/viewvc/httpd/httpd/trunk/support/win32/ApacheMonitor.c?view=log
    +1: wrowe
 
- * mod_proxy: Allow for keepalive backend proxies (PR43238), which also
-   addresses PR44026 and PR44543. These are pretty much interwrapped here.
-    Trunk version of patch:
-      http://svn.apache.org/viewvc?view=rev&revision=602542
-      http://svn.apache.org/viewvc?view=rev&revision=603237
-      http://svn.apache.org/viewvc?view=rev&revision=603502
-      http://svn.apache.org/viewvc?view=rev&revision=603543
-      http://svn.apache.org/viewvc?view=rev&revision=604447
-      http://svn.apache.org/viewvc?view=rev&revision=604449
-      http://svn.apache.org/viewvc?view=rev&revision=605314
-      http://svn.apache.org/viewvc?view=rev&revision=605838
-    Backport version for 2.2.x of patch:
-      http://people.apache.org/~rpluem/patches/proxy-ssl-44026-patch.txt
-   +1: jim, rpluem
-
  * mod_proxy:  In the case that we fail to read the response line
    from the backend and if we are a reverse proxy request, shutdown
    the connection WITHOUT ANY response to trigger a retry by the client
@@ -231,7 +231,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       consistent with what we do elsewhere but troubling...
       we need to find a better way to do this. In particular,
       ?ids cannot, iirc, be signed - this is more a note to
-      self ;) )
+      self ;) ) [Roy notes that the patch adds an id lookup
+      and replaces the id with the validated result.]
 
 * mod_ssl: Fix a memory leak with connections that have zlib compression
   turned on. PR 44975 [Joe Orton, Amund Elstad <Amund.Elstad ist.com>,