From abb9c2f97f9571245ced7a20d1a5caedb8d02ceb Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Fri, 31 May 2002 20:52:28 +0000 Subject: [PATCH] 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 --- include/ap_mmn.h | 2 +- modules/test/mod_bucketeer.c | 2 +- server/core.c | 2 +- server/error_bucket.c | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/ap_mmn.h b/include/ap_mmn.h index dda00bed36..ddd7cd8d43 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -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 diff --git a/modules/test/mod_bucketeer.c b/modules/test/mod_bucketeer.c index bb8ddb145e..6738cd69cc 100644 --- a/modules/test/mod_bucketeer.c +++ b/modules/test/mod_bucketeer.c @@ -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); diff --git a/server/core.c b/server/core.c index 5a38ab023b..8454dbc997 100644 --- a/server/core.c +++ b/server/core.c @@ -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); \ diff --git a/server/error_bucket.c b/server/error_bucket.c index 3aa2e9a6e0..c6f51d4123 100644 --- a/server/error_bucket.c +++ b/server/error_bucket.c @@ -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; } -- 2.50.1