From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 28 Feb 2014 11:52:55 +0000 (+0000)
Subject: Propose mod_deflate's r1572655, r1572896 and al to backport.
X-Git-Tag: 2.4.8~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bc6629906596053f6273b5620532fcb603abc41;p=apache

Propose mod_deflate's r1572655, r1572896 and al to backport.

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

diff --git a/STATUS b/STATUS
index ad09c92c4c..39191a1fc5 100644
--- a/STATUS
+++ b/STATUS
@@ -215,6 +215,30 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo MMN)
      +1: ylavic
 
+   * mod_deflate: Fix reentrance in output and input filters (buffering of
+                  incomplete Zlib header or validation bytes). PR 46146.
+     trunk patch: https://svn.apache.org/r1572655
+                  https://svn.apache.org/r1572663
+                  https://svn.apache.org/r1572668
+                  https://svn.apache.org/r1572669
+                  https://svn.apache.org/r1572670
+                  https://svn.apache.org/r1572671
+     2.4.x patch: trunk works, all in one patch below
+                  https://people.apache.org/~ylavic/httpd-2.4.x-mod_deflate_reentrance.patch
+     +1: ylavic
+     ylavic: does not depend on r1572896 and al below, both can be
+             backported in any order
+
+   * 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
+     2.4.x patch: trunk works
+     +1: ylavic
+     ylavic: does not depend on r1572655 and al above, both can be
+             backported in any order
+
 
 OTHER PROPOSALS