From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 29 May 2015 04:18:26 +0000 (+0000)
Subject: This appears to be promoted
X-Git-Tag: 2.4.13~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ffe52baa12fbdc4d8eab94f10cadabdb7dcf72d;p=apache

This appears to be promoted

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

diff --git a/STATUS b/STATUS
index 0999d57295..74fa4bb664 100644
--- a/STATUS
+++ b/STATUS
@@ -105,6 +105,21 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) 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).
+     trunk patch: http://svn.apache.org/r1482522 (partial, ap_map_http_request_error() things only!)
+                  http://svn.apache.org/r1529988
+                  http://svn.apache.org/r1529991
+                  http://svn.apache.org/r1643537
+                  http://svn.apache.org/r1643543
+                  http://svn.apache.org/r1657897
+                  http://svn.apache.org/r1665625
+                  http://svn.apache.org/r1665721
+                  http://svn.apache.org/r1674056
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ap_map_http_request_error-v2.patch
+     +1: ylavic, minfrin, wrowe
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -154,7 +169,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~jkaluza/patches/httpd-2.4.x-mod_journald.patch
      +1: jkaluza, wrowe
      wrowe: approves as experimental, 'with-modules=all' restriction
-            satisfies an concern I'd otherwise have.
+            satisfies the concern I'd otherwise have.
 
    * MPMs: Support SO_REUSEPORT to create multiple duplicated listener
            records for scalability (full log in 2.4.x patch).
@@ -178,21 +193,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
 
-  *) 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).
-     trunk patch: http://svn.apache.org/r1482522 (partial, ap_map_http_request_error() things only!)
-                  http://svn.apache.org/r1529988
-                  http://svn.apache.org/r1529991
-                  http://svn.apache.org/r1643537
-                  http://svn.apache.org/r1643543
-                  http://svn.apache.org/r1657897
-                  http://svn.apache.org/r1665625
-                  http://svn.apache.org/r1665721
-                  http://svn.apache.org/r1674056
-     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ap_map_http_request_error-v2.patch
-     +1: ylavic, minfrin
-
   *) 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