From 8dae7255bf0f7b53903dcfc69ac0391e16ebb142 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Fri, 2 Mar 2001 21:36:21 +0000 Subject: [PATCH] Use the proper enum for the block/non-block parameter to apr_bucket_read(). A couple of these changed in meaning (e.g., 1->APR_BLOCK_READ). PR: 6980 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88428 13f79535-47bb-0310-9956-ffa450edef68 --- modules/experimental/config.m4 | 1 + modules/experimental/mod_case_filter.c | 2 +- modules/experimental/mod_charset_lite.c | 4 ++-- modules/experimental/mod_disk_cache.c | 2 +- modules/experimental/mod_ext_filter.c | 4 ++-- modules/filters/mod_include.c | 4 ++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/experimental/config.m4 b/modules/experimental/config.m4 index 975e9d8329..609f41b59d 100644 --- a/modules/experimental/config.m4 +++ b/modules/experimental/config.m4 @@ -10,5 +10,6 @@ APACHE_MODULE(generic_hook_export, example hook exporter, , , no) APACHE_MODULE(generic_hook_import, example hook importer, , , no) APACHE_MODULE(optional_fn_import, example optional function importer, , , no) APACHE_MODULE(optional_fn_export, example optional function exporter, , , no) +APACHE_MODULE(bucket_trace, bucket trace module, , , no) APACHE_MODPATH_FINISH diff --git a/modules/experimental/mod_case_filter.c b/modules/experimental/mod_case_filter.c index 7afcefdffa..bb59985ae4 100644 --- a/modules/experimental/mod_case_filter.c +++ b/modules/experimental/mod_case_filter.c @@ -60,7 +60,7 @@ static apr_status_t CaseFilterOutFilter(ap_filter_t *f, } // read - apr_bucket_read(pbktIn,&data,&len,1); + apr_bucket_read(pbktIn,&data,&len,APR_BLOCK_READ); // write buf=apr_palloc(f->r->pool,len); diff --git a/modules/experimental/mod_charset_lite.c b/modules/experimental/mod_charset_lite.c index 096fba3f1a..8cadc729cf 100644 --- a/modules/experimental/mod_charset_lite.c +++ b/modules/experimental/mod_charset_lite.c @@ -751,7 +751,7 @@ static apr_status_t xlate_brigade(charset_filter_ctx_t *ctx, APR_BUCKET_IS_EOS(b)) { break; } - rv = apr_bucket_read(b, &bucket, &bytes_in_bucket, 0); + rv = apr_bucket_read(b, &bucket, &bytes_in_bucket, APR_BLOCK_READ); if (rv != APR_SUCCESS) { ctx->ees = EES_BUCKET_READ; break; @@ -913,7 +913,7 @@ static apr_status_t xlate_out_filter(ap_filter_t *f, apr_bucket_brigade *bb) } break; } - rv = apr_bucket_read(dptr, &cur_str, &cur_len, 0); + rv = apr_bucket_read(dptr, &cur_str, &cur_len, APR_BLOCK_READ); if (rv != APR_SUCCESS) { done = 1; ctx->ees = EES_BUCKET_READ; diff --git a/modules/experimental/mod_disk_cache.c b/modules/experimental/mod_disk_cache.c index ee60739522..cbd28bf04a 100644 --- a/modules/experimental/mod_disk_cache.c +++ b/modules/experimental/mod_disk_cache.c @@ -144,7 +144,7 @@ static int disk_cache(request_rec *r, apr_bucket_brigade *bb, void **cf) const char *str; apr_ssize_t length; - apr_bucket_read(e, &str, &length, 0); + apr_bucket_read(e, &str, &length, APR_BLOCK_READ); apr_file_write(ctx->fd, str, &length); } if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) { diff --git a/modules/experimental/mod_ext_filter.c b/modules/experimental/mod_ext_filter.c index fa618b9d57..85ceb639eb 100644 --- a/modules/experimental/mod_ext_filter.c +++ b/modules/experimental/mod_ext_filter.c @@ -659,7 +659,7 @@ static apr_status_t ef_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) break; } - rv = apr_bucket_read(b, &data, &len, 1); + rv = apr_bucket_read(b, &data, &len, APR_BLOCK_READ); if (rv != APR_SUCCESS) { ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "apr_bucket_read()"); return rv; @@ -764,7 +764,7 @@ static int ef_input_filter(ap_filter_t *f, apr_bucket_brigade *bb, APR_BRIGADE_FOREACH(b, bb) { if (!APR_BUCKET_IS_EOS(b)) { - if ((rv = apr_bucket_read(b, (const char **)&buf, &len, 0)) != APR_SUCCESS) { + if ((rv = apr_bucket_read(b, (const char **)&buf, &len, APR_BLOCK_READ)) != APR_SUCCESS) { ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "apr_bucket_read() failed"); return rv; } diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c index 2314cea09d..2d9eeca39b 100644 --- a/modules/filters/mod_include.c +++ b/modules/filters/mod_include.c @@ -159,7 +159,7 @@ static apr_bucket *find_start_sequence(apr_bucket *dptr, include_ctx_t *ctx, if (APR_BUCKET_IS_EOS(dptr)) { break; } - apr_bucket_read(dptr, &buf, &len, 0); + apr_bucket_read(dptr, &buf, &len, APR_BLOCK_READ); /* XXX handle retcodes */ if (len == 0) { /* end of pipe? */ break; @@ -257,7 +257,7 @@ static apr_bucket *find_end_sequence(apr_bucket *dptr, include_ctx_t *ctx, apr_b if (APR_BUCKET_IS_EOS(dptr)) { break; } - apr_bucket_read(dptr, &buf, &len, 0); + apr_bucket_read(dptr, &buf, &len, APR_BLOCK_READ); /* XXX handle retcodes */ if (len == 0) { /* end of pipe? */ break; -- 2.40.0