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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index dda00bed36ddc3f7e5db78a2e3f64971b7cb31c4..ddd7cd8d43992d9ef2edb6000072ca433b3e92c2 100644 (file)
--- 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 bb8ddb145ea7dd516bd1c91f288bb17a1cc84358..6738cd69cc2a90d450fb93d26a729b802abf7266 100644 (file)
--- 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 5a38ab023b1b97c53a7d278df1c31c1fbbebc3a3..8454dbc9978c061ec5e29c3e8856c363d8028357 100644 (file)
--- 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 3aa2e9a6e08e22be15a2e3fec54721e008fccde6..c6f51d41233b404b8f63ff76ce10597f9699f405 100644 (file)
--- 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;
 }