httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r722081 - in /httpd/httpd/trunk: CHANGES modules/http/http_filters.c
Date Mon, 01 Dec 2008 14:31:53 GMT
Author: covener
Date: Mon Dec  1 06:31:51 2008
New Revision: 722081

URL: http://svn.apache.org/viewvc?rev=722081&view=rev
Log:
To be safe, consume the entire brigade after processing an error bucket in
the HTTP output filter.

Submitted by: Rudeiger Pluem
Reviewed by: niq, covener


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/http/http_filters.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=722081&r1=722080&r2=722081&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Dec  1 06:31:51 2008
@@ -2,6 +2,11 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) core: When the ap_http_header_filter processes an error bucket, cleanup
+     the passed brigade before returning AP_FILTER_ERROR down the filter 
+     chain. This unambiguously ensures the same error bucket isn't revisited
+     [Ruediger Pluem]
+
   *) mod_lbmethod_heartbeat: New module to load balance mod_proxy workers
      based on heartbeats. [Paul Querna]
 

Modified: httpd/httpd/trunk/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=722081&r1=722080&r2=722081&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_filters.c (original)
+++ httpd/httpd/trunk/modules/http/http_filters.c Mon Dec  1 06:31:51 2008
@@ -1145,7 +1145,11 @@
         }
     }
     if (eb) {
-        ap_die(eb->status, r);
+        int status;
+
+        status = eb->status;
+        apr_brigade_cleanup(b);
+        ap_die(status, r);
         return AP_FILTER_ERROR;
     }
 



Mime
View raw message