From 80ddb8dadc44a38d5ca340ae414630b1b220eafc Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Mon, 27 Oct 2008 11:39:04 +0000 Subject: [PATCH] * Do more greedy reads in the core input filter to get more closer to the number of bytes requested. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@708144 13f79535-47bb-0310-9956-ffa450edef68 --- server/core_filters.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/server/core_filters.c b/server/core_filters.c index 4bfd41c5a84..9a07252e050 100644 --- a/server/core_filters.c +++ b/server/core_filters.c @@ -267,6 +267,37 @@ int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b, return APR_SUCCESS; } + /* Have we read as much data as we wanted (be greedy)? */ + if (len < readbytes) { + apr_size_t bucket_len; + + rv = APR_SUCCESS; + /* We already registered the data in e in len */ + e = APR_BUCKET_NEXT(e); + while ((len < readbytes) && (rv == APR_SUCCESS) + && (e != APR_BRIGADE_SENTINEL(ctx->b))) { + /* Check for the availability of buckets with known length */ + if (e->length != -1) { + len += e->length; + e = APR_BUCKET_NEXT(e); + } + else { + /* + * Read from bucket, but non blocking. If there isn't any + * more data, well than this is fine as well, we will + * not wait for more since we already got some and we are + * only checking if there isn't more. + */ + rv = apr_bucket_read(e, &str, &bucket_len, + APR_NONBLOCK_READ); + if (rv == APR_SUCCESS) { + len += bucket_len; + e = APR_BUCKET_NEXT(e); + } + } + } + } + /* We can only return at most what we read. */ if (len < readbytes) { readbytes = len; -- 2.47.2