Make ap_rflush use the flush bucket properly, and remove the BUFF code

from that function.

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

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 2ad8ea7e73ebb131acc74ec79af45c967865e069..d92d5660d7dcce7211b677e571d88c002a6fb99c 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -2854,13 +2854,6 @@ AP_DECLARE_NONSTD(int) ap_rvputs(request_rec *r, ...)
 
 AP_DECLARE(int) ap_rflush(request_rec *r)
 {
-    apr_status_t rv;
-
-    if ((rv = ap_bflush(r->connection->client)) != APR_SUCCESS) {
-        check_first_conn_error(r, "rflush", rv);
-        return EOF;
-    }
-#if USE_FLUSH_BUCKET
     /* we should be using a flush bucket to flush the stack, not buff code. */
     ap_bucket_brigade *bb;
     ap_bucket *b;
@@ -2869,7 +2862,6 @@ AP_DECLARE(int) ap_rflush(request_rec *r)
     b = ap_bucket_create_flush();
     AP_BRIGADE_INSERT_TAIL(bb, b);
     ap_pass_brigade(r->output_filters, bb);
-#endif
     return 0;
 }