You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2007/10/11 16:13:40 UTC

svn commit: r583830 - /httpd/httpd/trunk/server/util_filter.c

Author: jorton
Date: Thu Oct 11 07:13:40 2007
New Revision: 583830

URL: http://svn.apache.org/viewvc?rev=583830&view=rev
Log:
* server/util_filter.c (ap_filter_flush): Tweak comment; no functional
change.

Modified:
    httpd/httpd/trunk/server/util_filter.c

Modified: httpd/httpd/trunk/server/util_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_filter.c?rev=583830&r1=583829&r2=583830&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_filter.c (original)
+++ httpd/httpd/trunk/server/util_filter.c Thu Oct 11 07:13:40 2007
@@ -582,12 +582,11 @@
 
     rv = ap_pass_brigade(f, bb);
 
-    /* apr_brigade_write et all require that the flush callback
-     * ensures the brigade is empty upon return; otherwise the brigade
-     * may be left with a transient bucket whose contents have fallen
-     * out of scope.  Call cleanup here unconditionally, to avoid the
-     * issue even in error cases where some filter fails and leaves a
-     * non-empty brigade. */
+    /* Before invocation of the flush callback, apr_brigade_write et
+     * al may place transient buckets in the brigade, which will fall
+     * out of scope after returning.  Empty the brigade here, to avoid
+     * issues with leaving such buckets in the brigade if some filter
+     * fails and leaves a non-empty brigade. */
     apr_brigade_cleanup(bb);
 
     return rv;