From: Nick Kew <niq@apache.org>
Date: Tue, 7 Aug 2007 10:39:53 +0000 (+0000)
Subject: Add a backport proposal, and update an existing one to accept
X-Git-Tag: 2.2.5~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1423d6e459e213a5a5da87ebeaf4ccb16b3eeb34;p=thirdparty%2Fapache%2Fhttpd.git

Add a backport proposal, and update an existing one to accept
rpluem's additions to it.


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

diff --git a/STATUS b/STATUS
index 16b3fa12afb..0934f622d23 100644
--- a/STATUS
+++ b/STATUS
@@ -318,9 +318,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mod_deflate: don't try to operate on a Content-Range
       trunk: http://svn.apache.org/viewvc?view=rev&revision=563154
+             http://svn.apache.org/viewvc?view=rev&revision=563229
+             http://svn.apache.org/viewvc?view=rev&revision=563230
       2.2.x: trunk will work once PR: 23287 patch is applied.
-      +1: niq
-      rpluem says: If you add r563229 and r563230 I am +1.
+      +1: niq, rpluem
+
+    * mod_deflate: fix content_encoding detection from different
+      sources in inflate_out filter.
+      PR: 42993
+      trunk: http://svn.apache.org/viewvc?view=rev&revision=563317
+      2.2.x: trunk will work after previous patches are applied.
 
     * mod_core: Avoid that relative changes to Options change the settings for
       FileETag. This does NOT address the remaining issues with relative