summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--server/core.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 12cf300e25..be428d831e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
Changes with Apache 2.0.41
+ *) Fix memory leak in core_output_filter. [Justin Erenkrantz]
+
*) Add ability to htpasswd (via -5) to produce non-obfuscated MD5 hashes.
[Justin Erenkrantz]
diff --git a/server/core.c b/server/core.c
index 6848fd56cd..234de4af93 100644
--- a/server/core.c
+++ b/server/core.c
@@ -3798,7 +3798,7 @@ static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b)
if (APR_BUCKET_IS_EOS(last_e)) {
apr_bucket *bucket;
int file_bucket_saved = 0;
- APR_BUCKET_REMOVE(last_e);
+ apr_bucket_delete(last_e);
for (bucket = APR_BRIGADE_FIRST(b);
bucket != APR_BRIGADE_SENTINEL(b);
bucket = APR_BUCKET_NEXT(bucket)) {