Update httpd to reflect change with free() pointer in buckets code

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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 6e48e6c0fce89d7374de78498827dca173e5001d..d212482bd8672a3a08377151cf2ed447d495bdbd 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -77,13 +77,13 @@
  * 20010523 (2.0.19-dev) bump for scoreboard structure reordering
  * 20010627 (2.0.19-dev) more API changes than I can count
  * 20010726 (2.0.22-dev) more big API changes
- * 20010807 (2.0.23-dev) the dir d_is_absolute bit is introduced, etc
+ * 20010808 (2.0.23-dev) dir d_is_absolute bit introduced, bucket changes, etc
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20010807
+#define MODULE_MAGIC_NUMBER_MAJOR 20010808
 #endif
 #define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
 #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR  /* backward compat */

diff --git a/server/error_bucket.c b/server/error_bucket.c
index 90453a79c9246f9a6db541d5f3071530765f1746..6484feb2b9052727098fb0f3d952444d0f4cce6e 100644 (file)
--- a/server/error_bucket.c
+++ b/server/error_bucket.c
@@ -93,13 +93,13 @@ AP_DECLARE(apr_bucket *) ap_bucket_error_create(int error,
     apr_bucket *b = (apr_bucket *)malloc(sizeof(*b));
 
     APR_BUCKET_INIT(b);
+    b->free = free;
     return ap_bucket_error_make(b, error, buf, p);
 }
 
 AP_DECLARE_DATA const apr_bucket_type_t ap_bucket_type_error = {
     "ERROR", 5,
     free,
-    free,
     error_read,
     apr_bucket_setaside_notimpl,
     apr_bucket_split_notimpl,