From baa50d0a2d5fc3f95f2692889cc9200cafb6fa3c Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Wed, 4 Oct 2000 19:08:34 +0000 Subject: [PATCH] Back out a patch that should never have been committed git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86388 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http/http_protocol.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index e1c61d4039..2e6b6feafb 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -2362,22 +2362,8 @@ API_EXPORT(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz) apr_status_t rv; if (!r->read_chunked) { /* Content-length read */ - ap_bucket *b; - const char *tempbuf; - len_to_read = (r->remaining > bufsiz) ? bufsiz : r->remaining; - if (AP_BRIGADE_EMPTY(r->connection->input_data)) { - ap_get_brigade(r->connection->input_filters, r->connection->input_data); - } - b = AP_BRIGADE_FIRST(r->connection->input_data); - len_read = len_to_read; - rv = b->read(b, &tempbuf, &len_read, 0); - if (len_read < b->length) { - b->split(b, len_read); - } - memcpy(buffer, tempbuf, len_read); - AP_BUCKET_REMOVE(b); - b->destroy(b); + rv = ap_bread(r->connection->client, buffer, len_to_read, &len_read); if (len_read == 0) { /* error or eof */ if (rv != APR_SUCCESS) { r->connection->keepalive = -1; -- 2.40.0