Backport from 2.1:

core_output_filter: don't split the brigade after a FLUSH bucket if
it's the last bucket.  This prevents creating unneccessary empty
brigades which may not be destroyed until the end of a keepalive
connection.

Submitted by: Juan Rivera <Juan.Rivera@citrix.com>
Reviewed by: Brian Pane, Jeff Trawick, Justin Erenkrantz, Sander Striker

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

diff --git a/CHANGES b/CHANGES
index 29dd4d2a36be1b1be317a3fe5694b47b3caee18b..5917538b0404fba6143e52d32585a0fadda7af11 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,14 @@
 Changes with Apache 2.0.47
 
+  *) core_output_filter: don't split the brigade after a FLUSH bucket if
+     it's the last bucket.  This prevents creating unneccessary empty
+     brigades which may not be destroyed until the end of a keepalive
+     connection.
+     [Juan Rivera <Juan.Rivera@citrix.com>]
+
+  *) Add support for "streamy" PROPFIND responses.
+     [Ben Collins-Sussman <sussman@collab.net>]
+
   *) mod_cgid: Eliminate a double-close of a socket.  This resolves
      various operational problems in a threaded MPM, since on the
      second attempt to close the socket, the same descriptor was

diff --git a/STATUS b/STATUS
index 4f153931aa3dfc28fc6fcb301eb048856d93d4c7..10fd6670ec8b34e0d4e8570a2d2bb1d8ae639533 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/06/29 17:59:27 $]
+Last modified at [$Date: 2003/07/01 00:13:28 $]
 
 Release:
 
@@ -70,14 +70,6 @@ PATCHES TO PORT FROM 2.1
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/protocol.c.diff?r1=1.131&r2=1.132&diff_format=h
       +1: brianp, jerenkrantz
 
-    * core_output_filter: don't split the brigade after a FLUSH bucket
-      if it's the last bucket.  This prevents creating unneccessary empty
-      brigades which may not be destroyed until the end of a keepalive
-      connection.
-      server/core.c: r1.238
-      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c.diff?r1=1.237&r2=1.238
-      +1: brianp, trawick, jerenkrantz
-
     * Backport LimitInteralRecursion to 2.0 and 1.3.
       (1.3 patch is here: <http://cvs.apache.org/~nd/recursion13.patch>)
       (2.0 patch is here: <http://cvs.apache.org/~nd/recursion20.patch>)

diff --git a/server/core.c b/server/core.c
index bc940dc18c37f582d079bfc0cb6fd03a5b9919d2..408be364e6c2854781349c3519e20c13a1760848 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -3754,7 +3754,9 @@ static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b)
                 break;
             }
             if (APR_BUCKET_IS_FLUSH(e)) {
-                more = apr_brigade_split(b, APR_BUCKET_NEXT(e));
+                if (e != APR_BRIGADE_LAST(b)) {
+                    more = apr_brigade_split(b, APR_BUCKET_NEXT(e));
+                }
                 break;
             }