gstein 2003/07/15 23:31:53
Modified: modules/dav/main mod_dav.c
Log:
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.
Revision Changes Path
1.97 +6 -2 httpd-2.0/modules/dav/main/mod_dav.c
Index: mod_dav.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mod_dav.c 19 Jun 2003 21:24:10 -0000 1.96
+++ mod_dav.c 16 Jul 2003 06:31:53 -0000 1.97
@@ -567,7 +567,9 @@
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 @@
/* 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;
|