From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 7 Oct 2015 19:17:34 +0000 (+0000)
Subject: eor_bucket: follow up to r1707159.
X-Git-Tag: 2.5.0-alpha~2743
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9e521e94609b5236658644e6a2078ff069efca5;p=thirdparty%2Fapache%2Fhttpd.git

eor_bucket: follow up to r1707159.
We need an apr_bucket_refcount, as spotted by Ruediger.

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

diff --git a/server/eor_bucket.c b/server/eor_bucket.c
index bce4b441edb..ecb809ca77d 100644
--- a/server/eor_bucket.c
+++ b/server/eor_bucket.c
@@ -19,6 +19,11 @@
 #include "http_protocol.h"
 #include "scoreboard.h"
 
+typedef struct {
+    apr_bucket_refcount refcount;
+    request_rec *data;
+} ap_bucket_eor;
+
 static apr_status_t eor_bucket_cleanup(void *data)
 {
     request_rec **rp = data;
@@ -50,7 +55,7 @@ static apr_status_t eor_bucket_read(apr_bucket *b, const char **str,
 
 AP_DECLARE(apr_bucket *) ap_bucket_eor_make(apr_bucket *b, request_rec *r)
 {
-    apr_bucket *h;
+    ap_bucket_eor *h;
 
     h = apr_bucket_alloc(sizeof(*h), b->list);
     h->data = r;
@@ -70,7 +75,7 @@ AP_DECLARE(apr_bucket *) ap_bucket_eor_create(apr_bucket_alloc_t *list,
     b->list = list;
     b = ap_bucket_eor_make(b, r);
     if (r) {
-        apr_bucket *h = b->data;
+        ap_bucket_eor *h = b->data;
         /*
          * Register a cleanup for the request pool as the eor bucket could
          * have been allocated from a different pool then the request pool
@@ -87,7 +92,7 @@ AP_DECLARE(apr_bucket *) ap_bucket_eor_create(apr_bucket_alloc_t *list,
 
 static void eor_bucket_destroy(void *data)
 {
-    apr_bucket *h = data;
+    ap_bucket_eor *h = data;
 
     if (apr_bucket_shared_destroy(h)) {
         request_rec *r = h->data;