diff options
| author | Ryan Bloom <rbb@apache.org> | 2002-05-31 22:52:28 +0200 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2002-05-31 22:52:28 +0200 |
| commit | ca5fd7fb7b5f715b8ab719024739cd2c50c4a32d (patch) | |
| tree | b70efdb4f4565f7263a05e0cc40a7229b8de83ae /server | |
| parent | if we autoindex, discard the request body and check for any (diff) | |
| download | apache2-ca5fd7fb7b5f715b8ab719024739cd2c50c4a32d.tar.xz apache2-ca5fd7fb7b5f715b8ab719024739cd2c50c4a32d.zip | |
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
Diffstat (limited to 'server')
| -rw-r--r-- | server/core.c | 2 | ||||
| -rw-r--r-- | server/error_bucket.c | 1 |
2 files changed, 2 insertions, 1 deletions
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; } |