Commit abb9c2f9 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

The apr_bucket change requires a minor MMN bump. Also modify Apache's 

filters to use APR_BUCKET_IS_METADATA macro.


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

include/ap_mmn.h

+1 −1
Changes for include/ap_mmn.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ 
#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20020529

#endif

#define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */

#define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */



/**

 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

modules/test/mod_bucketeer.c

+1 −1
Changes for modules/test/mod_bucketeer.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static apr_status_t bucketeer_out_filter(ap_filter_t *f, 
            continue;

        }



        if (e->length == 0) {

        if (APR_BUCKET_IS_METADATA(e)) {

            /* metadata bucket */

            apr_bucket *cpy;

            apr_bucket_copy(e, &cpy);

server/core.c

+1 −1
Changes for server/core.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3331,7 +3331,7 @@ static int net_time_filter(ap_filter_t *f, apr_bucket_brigade *b, 
do { \

    apr_bucket *e = APR_BRIGADE_FIRST(b); \

    do {  \

        if (e->length == 0) { \

        if (e->length == 0 && !APR_BUCKET_IS_METADATA(e)) { \

            apr_bucket *d; \

            d = APR_BUCKET_NEXT(e); \

            apr_bucket_delete(e); \

server/error_bucket.c

+1 −0
Changes for server/error_bucket.c: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ AP_DECLARE(apr_bucket *) ap_bucket_error_make(apr_bucket *b, int error, 
    h->data = (buf) ? apr_pstrdup(p, buf) : NULL;



    b = apr_bucket_shared_make(b, h, 0, 0);

    b->is_metadata = 1;

    b->type = &ap_bucket_type_error;

    return b;

}