From: Jim Jagielski <jim@apache.org>
Date: Thu, 2 Aug 2007 13:17:23 +0000 (+0000)
Subject: Enough votes. commit
X-Git-Tag: 2.2.5~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91cb9a4825a2f3334cb369930227bf2f09b764ff;p=thirdparty%2Fapache%2Fhttpd.git

Enough votes. commit


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

diff --git a/STATUS b/STATUS
index f3f3f6278ca..d39c8fadb05 100644
--- a/STATUS
+++ b/STATUS
@@ -77,9 +77,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_deflate: don't try to compress/decompress metadata buckets
-      http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_deflate.c?view=diff&r1=556113&r2=476600
-      +1: gregames, trawick, rpluem
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 2fd15cba5f2..2cbb993da7a 100644
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -578,6 +578,16 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
             continue;
         }
 
+        if (APR_BUCKET_IS_METADATA(e)) {
+            /*
+             * Remove meta data bucket from old brigade and insert into the
+             * new.
+             */
+            APR_BUCKET_REMOVE(e);
+            APR_BRIGADE_INSERT_TAIL(ctx->bb, e);
+            continue;
+        }
+
         /* read */
         apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
 
@@ -1081,6 +1091,16 @@ static apr_status_t inflate_out_filter(ap_filter_t *f,
             continue;
         }
 
+        if (APR_BUCKET_IS_METADATA(e)) {
+            /*
+             * Remove meta data bucket from old brigade and insert into the
+             * new.
+             */
+            APR_BUCKET_REMOVE(e);
+            APR_BRIGADE_INSERT_TAIL(ctx->bb, e);
+            continue;
+        }
+
         /* read */
         apr_bucket_read(e, &data, &len, APR_BLOCK_READ);