It doesn't make any sense to set a CHUNK flag in the BUFF, because the

BUFF isn't used for output anymore.

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

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 5e698cbbe1a8a00d2e690542f821f1ee57622130..20a11e35d2a4a5c6a2a3cef75bbdaaeadf73c1b9 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -3394,14 +3394,6 @@ static apr_status_t core_output_filter(ap_filter_t *f, ap_bucket_brigade *b)
         ctx->b = NULL;
     }
 
-    /* Hijack any bytes in BUFF and prepend it to the brigade. */
-    if (c->client->outcnt) {
-        e = ap_bucket_create_pool(c->client->outbase,
-                                  c->client->outcnt, c->client->pool);
-        c->client->outcnt = 0;
-        AP_BRIGADE_INSERT_HEAD(b, e);
-    }
-
     /* Iterate over the brigade collecting iovecs */
     while (b) {
         nbytes = 0; /* in case more points to another brigade */

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index e75dd7a572a45d8632e752b4b9137e86e37f371f..b57fc1738d0166a0bd8bcd6ffb5ce2f0f31540fd 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -2418,10 +2418,6 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f, ap_bu
     ap_bsetopt(r->connection->client, BO_BYTECT, &zero);
     r->sent_bodyct = 1;         /* Whatever follows is real body stuff... */
 
-    /* Set buffer flags for the body */
-    if (r->chunked) {
-        ap_bsetflag(r->connection->client, B_CHUNK, 1);
-    }
     b2 = ap_brigade_create(r->pool);
     e = ap_bucket_create_pool(buff_start, strlen(buff_start), r->pool);
     AP_BRIGADE_INSERT_HEAD(b2, e);