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

diff --git a/modules/experimental/config.m4 b/modules/experimental/config.m4
index 975e9d832988b917b962a22275eeda153fbf02a1..609f41b59d121f8756fd23b85bac2ded167b6a3f 100644 (file)
--- 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 7afcefdffa90b5cf02daf4eda85764b156a3047d..bb59985ae4109aa25ef4a10863751221423dc2cb 100644 (file)
--- 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 096fba3f1af99b105d8cc1f87c02a674558ff554..8cadc729cf02a04b65fe6815f804bf8c6e67f240 100644 (file)
--- 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 ee6073952226ecc4c2b245b02fcb48628272c27f..cbd28bf04a7ffdca7e96c79f703444abb29d2d00 100644 (file)
--- 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 fa618b9d5787f0bf66164c87160dbf429be5692e..85ceb639eb869c93a2686bcc005ca1d436cb886b 100644 (file)
--- 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 2314cea09d3a8e31486ba9840e6dae60477cf1a4..2d9eeca39bc8a0a925d50173deaaef6e356f324b 100644 (file)
--- 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;