You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2002/05/31 22:52:29 UTC
cvs commit: httpd-2.0/server core.c error_bucket.c
rbb 2002/05/31 13:52:29
Modified: include ap_mmn.h
modules/test mod_bucketeer.c
server core.c error_bucket.c
Log:
The apr_bucket change requires a minor MMN bump. Also modify Apache's
filters to use APR_BUCKET_IS_METADATA macro.
Revision Changes Path
1.47 +1 -1 httpd-2.0/include/ap_mmn.h
Index: ap_mmn.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/ap_mmn.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ap_mmn.h 30 May 2002 05:57:33 -0000 1.46
+++ ap_mmn.h 31 May 2002 20:52:28 -0000 1.47
@@ -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
1.13 +1 -1 httpd-2.0/modules/test/mod_bucketeer.c
Index: mod_bucketeer.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/test/mod_bucketeer.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_bucketeer.c 31 May 2002 07:43:22 -0000 1.12
+++ mod_bucketeer.c 31 May 2002 20:52:28 -0000 1.13
@@ -141,7 +141,7 @@
continue;
}
- if (e->length == 0) {
+ if (APR_BUCKET_IS_METADATA(e)) {
/* metadata bucket */
apr_bucket *cpy;
apr_bucket_copy(e, &cpy);
1.182 +1 -1 httpd-2.0/server/core.c
Index: core.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/core.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- core.c 18 May 2002 17:22:23 -0000 1.181
+++ core.c 31 May 2002 20:52:28 -0000 1.182
@@ -3331,7 +3331,7 @@
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); \
1.16 +1 -0 httpd-2.0/server/error_bucket.c
Index: error_bucket.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/error_bucket.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- error_bucket.c 31 May 2002 05:03:09 -0000 1.15
+++ error_bucket.c 31 May 2002 20:52:28 -0000 1.16
@@ -86,6 +86,7 @@
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;
}