mod_logio no longer removes the EOS bucket. PR 27928.

Submitted by: Bojan Smojver <bojan rexursive.com>
Reviewed by: Andr� Malo, Jeff Trawick, Joe Orton

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

diff --git a/CHANGES b/CHANGES
index b8c63ad0faf2277bdf66ce8ffae5c645f6793cd5..042cd29299b1285bce09d5b788ac297927fb3035 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.50
 
+  *) mod_logio no longer removes the EOS bucket. PR 27928.
+     [Bojan Smojver <bojan rexursive.com>]
+
   *) htpasswd no longer refuses to process files that contain empty
      lines.  [André Malo]
 

diff --git a/STATUS b/STATUS
index 5978ecff1aa41eeb0a865897161973516d6b384b..37f6d70df87b5967c906a270938f56255b924db4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/05/26 23:14:03 $]
+Last modified at [$Date: 2004/05/26 23:30:38 $]
 
 Release:
 
@@ -199,10 +199,6 @@ PATCHES TO BACKPORT FROM 2.1
          http://www.apache.org/~nd/mod_rewrite_fixleak.diff
        +1: nd
 
-    *) mod_logio no longer removes the EOS bucket. PR 27928.
-         modules/loggers/mod_logio.c: r1.8
-       +1: nd, trawick, jorton
-
     *) mod_rewrite no longer turns forward proxy requests into reverse proxy
        requests. PR 28125
          modules/mappers/mod_rewrite.c: r1.255

diff --git a/modules/loggers/mod_logio.c b/modules/loggers/mod_logio.c
index 1f3bdcced251d4ffd0c1402e9c8efc5ff11104f7..d17daefd83d5fa8f912b4d173e0a46e4243aecf6 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);