Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E3D0910236 for ; Fri, 28 Feb 2014 11:53:48 +0000 (UTC) Received: (qmail 23917 invoked by uid 500); 28 Feb 2014 11:53:23 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 23735 invoked by uid 500); 28 Feb 2014 11:53:20 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 23714 invoked by uid 99); 28 Feb 2014 11:53:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Feb 2014 11:53:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Feb 2014 11:53:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5E0F0238897A; Fri, 28 Feb 2014 11:52:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1572927 - /httpd/httpd/branches/2.4.x/STATUS Date: Fri, 28 Feb 2014 11:52:56 -0000 To: cvs@httpd.apache.org From: ylavic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140228115256.5E0F0238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ylavic Date: Fri Feb 28 11:52:55 2014 New Revision: 1572927 URL: http://svn.apache.org/r1572927 Log: Propose mod_deflate's r1572655, r1572896 and al to backport. Modified: httpd/httpd/branches/2.4.x/STATUS Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1572927&r1=1572926&r2=1572927&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Fri Feb 28 11:52:55 2014 @@ -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