Extend apr_bucket_type_t to add a pointer to a function used

to free the bucket. This change enables custom buckets to
completely specify how they are to be allocated and freed.
Before this change, custom buckets were required to use the
same memory allocation scheme as the standard APR buckets.
[Saeid Sakhitab, Bill Stoddard]


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@58352 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 10 insertions, 0 deletions

diff --git a/buckets/apr_buckets_eos.c b/buckets/apr_buckets_eos.c
index fc058179..f3df4490 100644
--- a/buckets/apr_buckets_eos.c
+++ b/buckets/apr_buckets_eos.c
@@ -90,6 +90,7 @@ APU_DECLARE(apr_bucket *) apr_bucket_eos_create(void)
 APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_eos = {
     "EOS", 5,
     apr_bucket_destroy_noop,
+    free,
     eos_read,
     apr_bucket_setaside_noop,
     apr_bucket_split_notimpl,
diff --git a/buckets/apr_buckets_file.c b/buckets/apr_buckets_file.c
index b79830ae..86853586 100644
--- a/buckets/apr_buckets_file.c
+++ b/buckets/apr_buckets_file.c
@@ -262,6 +262,7 @@ static apr_status_t file_setaside(apr_bucket *data, apr_pool_t *reqpool)
 APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_file = {
     "FILE", 5,
     file_destroy,
+    free,
     file_read,
     file_setaside,
     apr_bucket_shared_split,
diff --git a/buckets/apr_buckets_flush.c b/buckets/apr_buckets_flush.c
index ee486a42..5bddb96d 100644
--- a/buckets/apr_buckets_flush.c
+++ b/buckets/apr_buckets_flush.c
@@ -90,6 +90,7 @@ APU_DECLARE(apr_bucket *) apr_bucket_flush_create(void)
 APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_flush = {
     "FLUSH", 5,
     apr_bucket_destroy_noop,
+    free,
     flush_read,
     apr_bucket_setaside_noop,
     apr_bucket_split_notimpl,
diff --git a/buckets/apr_buckets_heap.c b/buckets/apr_buckets_heap.c
index f0ba0f52..fea12f7d 100644
--- a/buckets/apr_buckets_heap.c
+++ b/buckets/apr_buckets_heap.c
@@ -126,6 +126,7 @@ APU_DECLARE(apr_bucket *) apr_bucket_heap_create(
 APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_heap = {
     "HEAP", 5,
     heap_destroy,
+    free,
     heap_read,
     apr_bucket_setaside_noop,
     apr_bucket_shared_split,
diff --git a/buckets/apr_buckets_mmap.c b/buckets/apr_buckets_mmap.c
index f0f6ca47..7aa4b5a3 100644
--- a/buckets/apr_buckets_mmap.c
+++ b/buckets/apr_buckets_mmap.c
@@ -144,6 +144,7 @@ static apr_status_t mmap_setaside(apr_bucket *data, apr_pool_t *p)
 APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_mmap = {
     "MMAP", 5,
     mmap_destroy,
+    free,
     mmap_read,
     mmap_setaside,
     apr_bucket_shared_split,
diff --git a/buckets/apr_buckets_pipe.c b/buckets/apr_buckets_pipe.c
index b5eda2e8..7b840554 100644
--- a/buckets/apr_buckets_pipe.c
+++ b/buckets/apr_buckets_pipe.c
@@ -153,6 +153,7 @@ APU_DECLARE(apr_bucket *) apr_bucket_pipe_create(apr_file_t *p)
 APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_pipe = {
     "PIPE", 5,
     apr_bucket_destroy_noop,
+    free,
     pipe_read,
     apr_bucket_setaside_notimpl,
     apr_bucket_split_notimpl,
diff --git a/buckets/apr_buckets_pool.c b/buckets/apr_buckets_pool.c
index 6a2589ae..403aac56 100644
--- a/buckets/apr_buckets_pool.c
+++ b/buckets/apr_buckets_pool.c
@@ -171,6 +171,7 @@ APU_DECLARE(apr_bucket *) apr_bucket_pool_create(
 APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_pool = {
     "POOL", 5,
     pool_destroy,
+    free,
     pool_read,
     apr_bucket_setaside_noop,
     apr_bucket_shared_split,
diff --git a/buckets/apr_buckets_simple.c b/buckets/apr_buckets_simple.c
index 3361bd4a..5400e09c 100644
--- a/buckets/apr_buckets_simple.c
+++ b/buckets/apr_buckets_simple.c
@@ -158,6 +158,7 @@ APU_DECLARE(apr_bucket *) apr_bucket_transient_create(
 const apr_bucket_type_t apr_bucket_type_immortal = {
     "IMMORTAL", 5,
     apr_bucket_destroy_noop,
+    free,
     simple_read,
     apr_bucket_setaside_noop,
     apr_bucket_simple_split,
@@ -167,6 +168,7 @@ const apr_bucket_type_t apr_bucket_type_immortal = {
 APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_transient = {
     "TRANSIENT", 5,
     apr_bucket_destroy_noop, 
+    free,
     simple_read,
     transient_setaside,
     apr_bucket_simple_split,
diff --git a/buckets/apr_buckets_socket.c b/buckets/apr_buckets_socket.c
index 9872ba89..a0508986 100644
--- a/buckets/apr_buckets_socket.c
+++ b/buckets/apr_buckets_socket.c
@@ -148,6 +148,7 @@ APU_DECLARE(apr_bucket *) apr_bucket_socket_create(apr_socket_t *p)
 APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_socket = {
     "SOCKET", 5,
     apr_bucket_destroy_noop,
+    free,
     socket_read,
     apr_bucket_setaside_notimpl, 
     apr_bucket_split_notimpl,