Fix a memory leak in mod_deflate with dynamic content. Because the

brigade was being destroyed (ie, cleanup unregistered) rather than just
emptied out and then reused anyway, the last call down the filter stack
would leak buckets.

PR: 14321
Submitted by:	Ken Franken <kfranken@decisionmark.com>
Reviewed by:	Jeff Trawick, Cliff Woolley

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

diff --git a/CHANGES b/CHANGES
index 174da035e1f1f129350d3858410806b9835847f8..7c87b47bce2b3686ce69c97ddb1f5b989a6284a1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.44
 
+  *) Fixed a memory leak in mod_deflate with dynamic content.
+     PR 14321  [Ken Franken <kfranken@decisionmark.com>]
+
   *) Add --[enable|disable]-v4-mapped configure option to control
      whether or not Apache expects to handle IPv4 connections
      on IPv6 listening sockets.  Either setting will work on 

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index bbb66d2cce5ad9d8506d60cf95a6520d3912e880..c340ccab1540df2f73efd09aad8b19b8eb48b4ac 100644 (file)
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -510,7 +510,7 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
         }
     }
 
-    apr_brigade_destroy(bb);
+    apr_brigade_cleanup(bb);
     return APR_SUCCESS;
 }