"flush_filters" is a misnomer. rename it. also shift it so that we can call

it from sub-request finalization.


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

1 files changed, 49 insertions, 0 deletions

diff --git a/buckets/register_patch.txt b/buckets/register_patch.txt
index 417bafc9c..07c1ae41b 100644
--- a/buckets/register_patch.txt
+++ b/buckets/register_patch.txt
@@ -91,3 +91,52 @@ diff -u -r1.35 http_request.c
  #endif /*APACHE_XLATE*/
      ap_finalize_sub_req_protocol(r);
      return retval;
+Index: http_protocol.c
+===================================================================
+RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
+retrieving revision 1.97
+diff -u -r1.97 http_protocol.c
+--- http_protocol.c	2000/07/21 19:50:47	1.97
++++ http_protocol.c	2000/07/25 11:47:14
+@@ -1278,8 +1278,19 @@
+     rnew->main = (request_rec *) r;
+ }
+ 
++static void end_output_stream(request_rec *r)
++{
++    /*
++    ** ### place holder to tell filters that no more content will be
++    ** ### arriving. typically, they will flush any pending content
++    */
++}
++
+ void ap_finalize_sub_req_protocol(request_rec *sub)
+ {
++    /* tell the filter chain there is no more content coming */
++    end_output_stream(sub);
++
+     SET_BYTES_SENT(sub->main);
+ }
+ 
+@@ -1833,11 +1844,6 @@
+ #endif /*APACHE_XLATE*/
+ }
+ 
+-static void flush_filters(request_rec *r)
+-{
+-    /* ### place holder to flush pending content through the filters */
+-}
+-
+ /* finalize_request_protocol is called at completion of sending the
+  * response.  It's sole purpose is to send the terminating protocol
+  * information for any wrappers around the response message body
+@@ -1845,7 +1851,8 @@
+  */
+ API_EXPORT(void) ap_finalize_request_protocol(request_rec *r)
+ {
+-    flush_filters(r);
++    /* tell the filter chain there is no more content coming */
++    end_output_stream(r);
+ 
+     if (r->chunked && !r->connection->aborted) {
+ #ifdef APACHE_XLATE