Commit c5a1e372 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent e0f3979a

modules/experimental/config.m4

+1 −0
Original line number Diff line number Diff line
@@ -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

modules/experimental/mod_case_filter.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

modules/experimental/mod_charset_lite.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

modules/experimental/mod_disk_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -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))) {

modules/experimental/mod_ext_filter.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

            }