From: Stefan Fritsch <sf@apache.org>
Date: Mon, 1 Aug 2011 21:48:03 +0000 (+0000)
Subject: Fix endless loop if first bucket is metadata
X-Git-Tag: 2.3.15~428
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=25d5dd117e2600a2578c3ae7cdd423f9a92023a4;p=thirdparty%2Fapache%2Fhttpd.git

Fix endless loop if first bucket is metadata

PR: 51590
Submitted by: Torsten Foertsch <torsten foertsch gmx net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152943 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 7b0e94695e0..f489b691ef8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.3.15
 
+  *) mod_deflate: Fix endless loop if first bucket is metadata. PR 51590.
+     [Torsten Foertsch <torsten foertsch gmx net>]
 
 Changes with Apache 2.3.14
 
diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 2f186433b75..60256a1031f 100644
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -458,8 +458,10 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
                 ap_remove_output_filter(f);
                 return ap_pass_brigade(f->next, bb);
             }
-            if (APR_BUCKET_IS_METADATA(e))
+            if (APR_BUCKET_IS_METADATA(e)) {
+                e = APR_BUCKET_NEXT(e);
                 continue;
+            }
 
             rc = apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
             if (rc != APR_SUCCESS)