From: Jim Jagielski <jim@apache.org>
Date: Thu, 17 Jul 2014 18:19:00 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.28~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56e0aae121ae891bcf43fdaf06780e25c3028857;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 480b5dff21a..fcfc357bd70 100644
--- a/STATUS
+++ b/STATUS
@@ -110,6 +110,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~covener/patches/httpd-2.2.x-deflate_limitrequestbody.diff
      +1: covener, ylavic, jorton
 
+   * mod_deflate: Don't fail when asked to flush inflated data to the user-agent
+                  and that coincides with the end of stream ("Zlib error flushing
+                  inflate buffer"). PR 56196.
+     trunk patch: http://svn.apache.org/r1572896
+                  http://svn.apache.org/r1572911
+                  http://svn.apache.org/r1603156 (partially, CHANGES update)
+     2.4.x patch: http://svn.apache.org/r1610397 (2.4.10)
+     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_deflate-flush_end_of_stream.patch
+                  (modulo CHANGES)
+     +1: ylavic, breser, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -171,17 +182,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   (modulo CHANGES)
      +1: ylavic, breser
 
-   * mod_deflate: Don't fail when asked to flush inflated data to the user-agent
-                  and that coincides with the end of stream ("Zlib error flushing
-                  inflate buffer"). PR 56196.
-     trunk patch: http://svn.apache.org/r1572896
-                  http://svn.apache.org/r1572911
-                  http://svn.apache.org/r1603156 (partially, CHANGES update)
-     2.4.x patch: http://svn.apache.org/r1610397 (2.4.10)
-     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_deflate-flush_end_of_stream.patch
-                  (modulo CHANGES)
-     +1: ylavic, breser, jim
-
    *) core: Detect incomplete request and response bodies, log an error and
             forward it to the underlying filters. PR 55475 [Yann Ylavic]
      trunk patch: http://svn.apache.org/r1538776