From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 9 Jul 2014 16:45:51 +0000 (+0000)
Subject: Add mod_deflate missing commits (present in 2.2.x patches).
X-Git-Tag: 2.2.28~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef3e9de2785cbbb94b3af87dafd1710159747e61;p=thirdparty%2Fapache%2Fhttpd.git

Add mod_deflate missing commits (present in 2.2.x patches).

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

diff --git a/STATUS b/STATUS
index 5c1d94d1c74..721b33649c8 100644
--- a/STATUS
+++ b/STATUS
@@ -138,6 +138,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   https://svn.apache.org/r1587594
                   https://svn.apache.org/r1587639
                   https://svn.apache.org/r1590509
+                  https://svn.apache.org/r1603156 (partially, CHANGES update)
+                  https://svn.apache.org/r1604353
      2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_deflate_reentrant_with_CHANGES.patch
                   (modulo CHANGES)
      +1: ylavic
@@ -146,6 +148,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   Input SIZE contains the size of the original input data modulo 2^32.
                   PR 56062.
      trunk patch: http://svn.apache.org/r1572092
+                  http://svn.apache.org/r1603156 (partially, CHANGES update)
      2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_deflate_4GB.patch
                   (modulo CHANGES)
      +1: ylavic
@@ -155,6 +158,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   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.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_deflate-flush_end_of_stream.patch
                   (modulo CHANGES)
      +1: ylavic