From b48d65b42624bbc612afea4fe41a028c48a705d4 Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Fri, 8 Dec 2000 01:26:31 +0000 Subject: [PATCH] Get Apache filters and Apr-util buckets using the same values for blocking and non-blocking reads. This allows us to use the mode parameter passed to a filter to read from the bucket correctly. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87256 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http/http_protocol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 892d2e00a3..eb4906f5a5 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -891,7 +891,7 @@ apr_status_t ap_dechunk_filter(ap_filter_t *f, ap_bucket_brigade *bb, */ b = AP_BRIGADE_FIRST(bb); while (b != AP_BRIGADE_SENTINEL(bb) && !AP_BUCKET_IS_EOS(b)) { - ap_bucket_read(b, &buf, &len, AP_BLOCK_READ); + ap_bucket_read(b, &buf, &len, mode); AP_DEBUG_ASSERT(len <= ctx->chunk_size - ctx->bytes_delivered); ctx->bytes_delivered += len; b = AP_BUCKET_NEXT(b); @@ -966,7 +966,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, ap_bucket_brigade *b, ap_input_mode_ while (e != AP_BRIGADE_SENTINEL(ctx->b)) { const char *ignore; - if ((rv = ap_bucket_read(e, &ignore, &len, AP_BLOCK_READ)) != APR_SUCCESS) { + if ((rv = ap_bucket_read(e, &ignore, &len, mode)) != APR_SUCCESS) { /* probably APR_IS_EAGAIN(rv); socket state isn't correct; * remove log once we get this squared away */ ap_log_error(APLOG_MARK, APLOG_ERR, rv, f->c->base_server, @@ -1002,7 +1002,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, ap_bucket_brigade *b, ap_input_mode_ while (!AP_BRIGADE_EMPTY(ctx->b)) { e = AP_BRIGADE_FIRST(ctx->b); - if ((rv = ap_bucket_read(e, (const char **)&buff, &len, AP_BLOCK_READ)) != APR_SUCCESS) { + if ((rv = ap_bucket_read(e, (const char **)&buff, &len, mode)) != APR_SUCCESS) { return rv; } -- 2.50.1