* Reset the votes and add a version of the patch that applies cleanly

  to 2.2.x.

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

diff --git a/STATUS b/STATUS
index 18877a4b75a356588c562fcd837c9d5b4c2247f3..99922d87cd6b090c6097d3361542fc6e3dcff478 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -77,14 +77,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_proxy_ajp: Fix wrong retry when sending the response failed.
-      PR 40310 (The old fixes weren't ok).
-      Trunk version of patch:
-      http://svn.apache.org/viewvc?view=rev&revision=518938
-      http://svn.apache.org/viewvc?view=rev&revision=534031
-      (It also works for httpd-2.2.x).
-      +1: jfclere, rpluem, wrowe
-      jerenkrantz says: Does not apply cleanly to 2.2.x.
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
@@ -228,6 +220,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        http://people.apache.org/~chrisd/patches/mod_dbd_pools_groups/mod_dbd-4groups-2.2.x.patch
      +1: chrisd
 
+    * mod_proxy_ajp: Fix wrong retry when sending the response failed.
+      PR 40310 (The old fixes weren't ok).
+      Trunk version of patch:
+        http://svn.apache.org/viewvc?view=rev&revision=518938
+        http://svn.apache.org/viewvc?view=rev&revision=534031
+      2.2.x version of patch:
+        http://people.apache.org/~rpluem/patches/40310.diff
+      +1: rpluem
+      jerenkrantz says: Does not apply cleanly to 2.2.x.
+      rpluem answers: svn merge did not notice this / resolved this, but you are
+                      correct. There is a conflict because r467014 is not
+                      backported to 2.2.x so far. So I reset the votes and add a
+                      version of the patch that applies cleanly to 2.2.x.
+
 PATCHES/ISSUES THAT ARE STALLED
 
     * PKCS#7: backport PCKS#7 patches from trunk.