httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1152943 - in /httpd/httpd/trunk: CHANGES modules/filters/mod_deflate.c
Date Mon, 01 Aug 2011 21:48:04 GMT
Author: sf
Date: Mon Aug  1 21:48:03 2011
New Revision: 1152943

URL: http://svn.apache.org/viewvc?rev=1152943&view=rev
Log:
Fix endless loop if first bucket is metadata

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

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/filters/mod_deflate.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1152943&r1=1152942&r2=1152943&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Aug  1 21:48:03 2011
@@ -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
 

Modified: httpd/httpd/trunk/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_deflate.c?rev=1152943&r1=1152942&r2=1152943&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_deflate.c Mon Aug  1 21:48:03 2011
@@ -458,8 +458,10 @@ static apr_status_t deflate_out_filter(a
                 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)



Mime
View raw message