Switch ap_filter_flush() to ap_pass_brigade(). This removes a layer of

function calls, provides type safety for the ap_filter_t*, and
clarifies what is really going on (i.e. we aren't sending a FLUSH
bucket of any kind).

* mod_dav.c (dav_send_multistatus, dav_method_propfind): change the
    ap_filter_flush call to ap_pass_brigade; flip the params to match
    the prototype.

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

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 57f222f2588c84ddcf5a7600b06ecea96fb9bf88..2f966515f66554579492f527c500acb774ebb2be 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -567,7 +567,9 @@ static void dav_send_multistatus(request_rec *r, int status,
     apr_pool_destroy(subpool);
 
     ap_fputs(r->output_filters, bb, "</D:multistatus>" DEBUG_CR);
-    ap_filter_flush(bb, r->output_filters);
+
+    /* deliver whatever might be remaining in the brigade */
+    ap_pass_brigade(r->output_filters, bb);
 }
 
 /*
@@ -2076,7 +2078,9 @@ static int dav_method_propfind(request_rec *r)
 
     /* Finish up the multistatus response. */
     ap_fputs(r->output_filters, ctx.bb, "</D:multistatus>" DEBUG_CR);
-    ap_filter_flush(ctx.bb, r->output_filters);
+
+    /* deliver whatever might be remaining in the brigade */
+    ap_pass_brigade(r->output_filters, ctx.bb);
 
     /* the response has been sent. */
     return DONE;