Both the ftp and http proxies were erroneously sending a flush bucket after

an eos bucket. This had been put in place to repair a bug, but was covering
the symptoms, rather than providing the cure. Bug repaired, and kludge
removed.

Submitted by: barbee@veribox.net

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

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index a6fca3498029111b0be678f1e7d07d6f0f2f93ec..2605b95d10466379d7501a577379740e8f60b313 100644 (file)
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -1583,8 +1583,6 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
        /* read the body, pass it to the output filters */
        while (ap_get_brigade(remote->input_filters, bb, AP_MODE_BLOCKING, &readbytes) == APR_SUCCESS) {
            if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
-               e = apr_bucket_flush_create();
-               APR_BRIGADE_INSERT_TAIL(bb, e);
                ap_pass_brigade(r->output_filters, bb);
                break;
            }

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 20d7b1ad87d6f98404456b85b0267fca2aa1cb9c..fd2edfa770332ecdb931900e2899bf3e757b4efc 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -783,8 +783,6 @@ int ap_proxy_http_handler(request_rec *r, proxy_server_conf *conf,
        /* read the body, pass it to the output filters */
        while (ap_get_brigade(rp->input_filters, bb, AP_MODE_BLOCKING, &readbytes) == APR_SUCCESS) {
            if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
-               e = apr_bucket_flush_create();
-               APR_BRIGADE_INSERT_TAIL(bb, e);
                ap_pass_brigade(r->output_filters, bb);
                break;
            }