From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 18 Jul 2014 19:11:10 +0000 (+0000)
Subject: mod_deflate proposal v3.
X-Git-Tag: 2.2.28~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b58875a84770b5cdbb0491424d76dfe6c133a9e;p=thirdparty%2Fapache%2Fhttpd.git

mod_deflate proposal v3.

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

diff --git a/STATUS b/STATUS
index f7144d27cb8..fa656ac3a0a 100644
--- a/STATUS
+++ b/STATUS
@@ -157,9 +157,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_v2.patch
+     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_deflate_reentrant_with_CHANGES_v3.patch
                   (modulo CHANGES)
      +1: ylavic, wrowe
+     ylavic: v3 without the merge conflict with PR 56062 above.
 
    *) core: Detect incomplete request and response bodies, log an error and
             forward it to the underlying filters. PR 55475 [Yann Ylavic]