Fix two problems. First we are setting aside the wrong bucket brigade. Second, we...

check that a setaside routine is defined for the bucket before attempting to call it.  Not sure
at all if we even want to keep this routine as it does not allow using filter->ctx for other
purposes.

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

diff --git a/server/util_filter.c b/server/util_filter.c
index db3582596b2b7971e985cc9dd03862fe829c27f2..2b0ff6f29cf8d26d23e3354f6e04e7cbd5cf6b2d 100644 (file)
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -247,8 +247,9 @@ API_EXPORT(void) ap_save_data_to_filter(ap_filter_t *f, ap_bucket_brigade **b)
         bb = ap_brigade_create(f->r->pool);
     }
     
-    AP_RING_FOREACH(e, &bb->list, ap_bucket, link) {
-       e->setaside(e);
+    AP_RING_FOREACH(e, &(*b)->list, ap_bucket, link) {
+        if (e->setaside)
+            e->setaside(e);
     }
     AP_BRIGADE_CONCAT(bb, *b);
     f->ctx = bb;