From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 18 Nov 2006 22:37:44 +0000 (+0000)
Subject: * Add additional fixes to proposal. The merged ones have been updated on
X-Git-Tag: 2.2.4~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6283256a550f1049b769fd91434bd96bf7bb86fc;p=thirdparty%2Fapache%2Fhttpd.git

* Add additional fixes to proposal. The merged ones have been updated on
  people.apache.org in the meantime.


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

diff --git a/STATUS b/STATUS
index 67434e77131..c690b83d542 100644
--- a/STATUS
+++ b/STATUS
@@ -133,6 +133,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         Changes on inflate output filter:
           http://svn.apache.org/viewvc?view=rev&revision=416165
           http://svn.apache.org/viewvc?view=rev&revision=426799
+          http://svn.apache.org/viewvc?view=rev&revision=475403
+          http://svn.apache.org/viewvc?view=rev&revision=475406
+          http://svn.apache.org/viewvc?view=rev&revision=475915
+          http://svn.apache.org/viewvc?view=rev&revision=475920
+          http://svn.apache.org/viewvc?view=rev&revision=475922
+          http://svn.apache.org/viewvc?view=rev&revision=476600
 
         Changlog entry:
           http://svn.apache.org/viewvc?view=rev&revision=437668
@@ -148,8 +154,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
             Merged subversion comments: http://people.apache.org/~rpluem/patches/mod_deflate_rework/inflate_output.log
         The patch for the inflate output filter requires the patch for the
         deflate output filter.
-      +1 niq, rpluem (with additional fixes in
-              R475403,475406,475915,475920,475922,476600)
+      +1 rpluem, niq
 
     * mod_proxy: Add in support for ping/pong (heartbeat test) for
       the Proxy. Implement cping/cpong for AJP.