no longer remove the EOS bucket

PR: 27928
Submitted by: Bojan Smojver <bojan rexursive.com>

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

diff --git a/CHANGES b/CHANGES
index 2d612a8fa27085316f6af422e3d7033a7e01b083..10fef6170226c6902d1ad1a99f985819a05c16be 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_logio no longer removes the EOS bucket. PR 27928.
+     [Bojan Smojver <bojan rexursive.com>]
+
   *) mod_rewrite no longer turns forward proxy requests into reverse proxy
      requests. PR 28125  [ast domdv.de, André Malo]
 

diff --git a/modules/loggers/mod_logio.c b/modules/loggers/mod_logio.c
index 6d57c3ce1d10aac627ddd9730e49d427c6eee72b..3154bb87ba905ded578d51532115a9ebf37dea85 100644 (file)
--- a/modules/loggers/mod_logio.c
+++ b/modules/loggers/mod_logio.c
@@ -127,10 +127,8 @@ static apr_status_t logio_out_filter(ap_filter_t *f,
 
     /* End of data, make sure we flush */
     if (APR_BUCKET_IS_EOS(b)) {
-        APR_BRIGADE_INSERT_TAIL(bb,
-                                apr_bucket_flush_create(f->c->bucket_alloc));
-        APR_BUCKET_REMOVE(b);
-        apr_bucket_destroy(b);
+        APR_BUCKET_INSERT_BEFORE(b,
+                                 apr_bucket_flush_create(f->c->bucket_alloc));
     }
 
     return ap_pass_brigade(f->next, bb);