From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 18 Jul 2014 21:24:10 +0000 (+0000)
Subject: v4 for PR 46146.
X-Git-Tag: 2.2.28~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45cda448e88f7d55f1661b5e69757b9c8db0bf38;p=thirdparty%2Fapache%2Fhttpd.git

v4 for PR 46146.

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

diff --git a/STATUS b/STATUS
index 344c140f6ea..b51dfe1ba09 100644
--- a/STATUS
+++ b/STATUS
@@ -147,10 +147,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   https://svn.apache.org/r1604353
                   https://svn.apache.org/r1611725
      2.4.x patch: https://svn.apache.org/r1604458 (2.4.10)
-     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_deflate_reentrant_with_CHANGES_v3.patch
+     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_deflate_reentrant_with_CHANGES_v4.patch
                   (modulo CHANGES)
      +1: ylavic, wrowe
-     ylavic: v3 without the merge conflict with PR 56062 above.
+     ylavic: v4 is now merging correctly after http://svn.apache.org/r1611806
 
    *) core: Detect incomplete request and response bodies, log an error and
             forward it to the underlying filters. PR 55475 [Yann Ylavic]