vote+promote, remove duplicate mod_proxy proposal

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

diff --git a/STATUS b/STATUS
index df2247d0b754b40cdc9d966ac789e3dc5ad5a502..d638621adb42e66e3c1d6523a1c98c2b122a15f9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -91,6 +91,10 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_ssl: Fix possible OCSP response truncation.
+    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1488296
+    2.4.x patch: trunk patch works modulo CHANGES
+    +1: jorton, jj, sf
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -155,12 +159,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk patch works modulo CHANGES
     +1: minfrin, jim
 
-  * mod_proxy: protect pool usage w/ mutex.
-    trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1480627
-                 https://svn.apache.org/viewvc?view=revision&revision=1482859
-    2.4.x patch: trunk patch works modulo CHANGES
-    +1: jim
-
   * mod_proxy: Connection header clearing issues
     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1481891
                  https://svn.apache.org/viewvc?view=revision&revision=1482075
@@ -231,11 +229,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk patch works
     +1: jailletc36, jj
 
-  * mod_ssl: Fix possible OCSP response truncation.
-    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1488296
-    2.4.x patch: trunk patch works modulo CHANGES
-    +1: jorton, jj
-
 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.