Move some "stalled" backports and note that a 2.4 patch

is in the works

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

diff --git a/STATUS b/STATUS
index 12407d8b4b61ee97aaa63cab45134c30cb67e74e..c1c9cd833b83edddc75a8ee5b6651243509655bf 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -104,18 +104,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   * core: Stop the HTTP_IN filter from attempting to write error buckets
     to the output filters
     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1482522
-    2.4.x patch: trunk patch works modulo CHANGES and ap_mmn
+                 https://svn.apache.org/viewvc?view=revision&revision=1482918
+                 https://svn.apache.org/viewvc?view=revision&revision=1484832
+    2.4.x patch: /* working on it */
     +1:  jim
-    rjung: it seems to me from dev list discussion, that r1482918 and r1484832
-           are also needed.
-
-  * mod_proxy: Ensure network errors detected by the proxy are returned as
-    504 Gateway Timout as opposed to 502 Bad Gateway
-    trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1480058
-    2.4.x patch: trunk patch works modulo CHANGES
-    +1:
-    -1: rpluem: This change is still disputed. See
-        http://mail-archives.apache.org/mod_mbox/httpd-dev/201305.mbox/%3C1B16B9E3-87BA-4EEF-939C-7C7313B54714%40gbiv.com%3E
 
   * mod_socache_shmcb.c: Remove arbitrary restriction on shared memory size
     previously limited to 64MB.
@@ -210,6 +202,24 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: http://people.apache.org/~jim/patches/proxy-fcgi.patch
     +1: trawick, jim
 
+
+
+OTHER PROPOSALS
+
+   * 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 add them above.
+
+PATCHES/ISSUES THAT ARE STALLED
+
+  * mod_proxy: Ensure network errors detected by the proxy are returned as
+    504 Gateway Timout as opposed to 502 Bad Gateway
+    trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1480058
+    2.4.x patch: trunk patch works modulo CHANGES
+    +1:
+    -1: rpluem: This change is still disputed. See
+        http://mail-archives.apache.org/mod_mbox/httpd-dev/201305.mbox/%3C1B16B9E3-87BA-4EEF-939C-7C7313B54714%40gbiv.com%3E
+
   * protocol: draft-ietf-httpbis-p1-messaging-23 fixes regarding interactions
               between TE and content-length in the same req/resp.
     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1524192
@@ -223,15 +233,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     [wrowe asks] Where is verification of (!keepalive)?  Do we know the
                  connection will be closed anytime in the near future?
 
-
-OTHER PROPOSALS
-
-   * 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 add them above.
-
-PATCHES/ISSUES THAT ARE STALLED
-
   * mod_proxy: support Unix domain sockets /* ON HOLD */
     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1451633
                  https://svn.apache.org/viewvc?view=revision&revision=1451905