Commit f38f4beb authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Use ap_pass_brigade_fchk() 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205423 13f79535-47bb-0310-9956-ffa450edef68
parent bbf83b24

modules/cache/mod_cache.c

+8 −25
Changes for modules/cache/mod_cache.c: 8 added lines, 25 removed lines.
Original line number Diff line number Diff line
@@ -292,19 +292,11 @@ static int cache_quick_handler(request_rec *r, int lookup) 
    out = apr_brigade_create(r->pool, r->connection->bucket_alloc);

    e = apr_bucket_eos_create(out->bucket_alloc);

    APR_BRIGADE_INSERT_TAIL(out, e);

    rv = ap_pass_brigade(r->output_filters, out);

    if (rv != APR_SUCCESS) {

        if (rv != AP_FILTER_ERROR) {

            /* no way to know what type of error occurred */

            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,

                          "cache_quick_handler(%s): ap_pass_brigade returned %i",

                          cache->provider_name, rv);

            return HTTP_INTERNAL_SERVER_ERROR;

        }

        return rv;

    }



    return OK;

    return ap_pass_brigade_fchk(r, out,

                                apr_psprintf(r->pool,

                                             "cache_quick_handler(%s): ap_pass_brigade returned",

                                             cache->provider_name));

}



/**
@@ -576,19 +568,10 @@ static int cache_handler(request_rec *r) 
    out = apr_brigade_create(r->pool, r->connection->bucket_alloc);

    e = apr_bucket_eos_create(out->bucket_alloc);

    APR_BRIGADE_INSERT_TAIL(out, e);

    rv = ap_pass_brigade(r->output_filters, out);

    if (rv != APR_SUCCESS) {

        if (rv != AP_FILTER_ERROR) {

            /* no way to know what type of error occurred */

            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,

                          "cache_handler(%s): ap_pass_brigade returned %i",

                          cache->provider_name, rv);

            return HTTP_INTERNAL_SERVER_ERROR;

        }

        return rv;

    }



    return OK;

    return ap_pass_brigade_fchk(r, out,

                                apr_psprintf(r->pool,

                                             "cache(%s): ap_pass_brigade returned",

                                             cache->provider_name));

}



/*

modules/mappers/mod_negotiation.c

+1 −10
Changes for modules/mappers/mod_negotiation.c: 1 added line, 10 removed lines.
Original line number Diff line number Diff line
@@ -3051,16 +3051,7 @@ static int handle_map_file(request_rec *r) 
        e = apr_bucket_eos_create(c->bucket_alloc);

        APR_BRIGADE_INSERT_TAIL(bb, e);



        rv = ap_pass_brigade(r->output_filters, bb);

        if (rv != APR_SUCCESS) { 

            if (rv != AP_FILTER_ERROR) {

                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,

                              "ap_pass_brigade returned %d", rv);

                return HTTP_INTERNAL_SERVER_ERROR;

            }

            return AP_FILTER_ERROR;

        }

        return OK;

        return ap_pass_brigade_fchk(r, bb, NULL);

    }



    if (r->path_info && *r->path_info) {