From: Jim Jagielski <jim@apache.org>
Date: Fri, 22 May 2015 13:26:56 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.13~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=751fb3c5c9ff497b445aa84e8d79274e9aa15ba4;p=apache

promote



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

diff --git a/STATUS b/STATUS
index e145d1e75f..a789dea9d2 100644
--- a/STATUS
+++ b/STATUS
@@ -105,6 +105,19 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) http: Make ap_die() robust against any HTTP error code and not modify
+     response status (finally logged) when nothing is to be done. PR 56035.
+     trunk patch: http://svn.apache.org/r1657881
+                  http://svn.apache.org/r1665643
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, minfrin, jim
+
+  *) core: Cleanup the request soon/even if some output filter fails to
+     handle the EOR bucket.
+     trunk patch: http://svn.apache.org/r1666998
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, minfrin, jim
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -179,13 +192,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ap_listeners_buckets-v3.patch
      +1: ylavic, jim
 
-  *) http: Make ap_die() robust against any HTTP error code and not modify
-     response status (finally logged) when nothing is to be done. PR 56035.
-     trunk patch: http://svn.apache.org/r1657881
-                  http://svn.apache.org/r1665643
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, minfrin, jim
-
   *) core, modules: Avoid error response/document handling by the core if some
      handler or input filter already did it while reading the request (causing
      a double response body).
@@ -222,12 +228,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              possibly as simple as renaming output_failed => client_failed (r1674056 added
              above), WDYT?
 
-  *) core: Cleanup the request soon/even if some output filter fails to
-     handle the EOR bucket.
-     trunk patch: http://svn.apache.org/r1666998
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, minfrin, jim
-
   *) http: Don't remove the Content-Length of zero from a HEAD response if
      it comes from an origin server, module or script. Allow the previous
      behaviour (for legacy/buggy modules only, not origin) by also backporting