From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 5 Jan 2016 18:06:23 +0000 (+0000)
Subject: mod_ssl: follow up to r1723122.
X-Git-Tag: 2.5.0-alpha~2454
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=315c1ceeed6f4e389901ec796e345274f47811c3;p=thirdparty%2Fapache%2Fhttpd.git

mod_ssl: follow up to r1723122.
Coalesce when (subsequent brigade's) data bucket is not last (likely followed
by FLUSH or EOS) but we have buffered data already.


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

diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index dc998462b08..8c6d8ac97e9 100644
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -1567,11 +1567,12 @@ static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f,
     /* Coalesce the prefix, if:
      * a) more than one bucket is found to coalesce, or
      * b) the brigade contains only a single data bucket, or
-     * c)
+     * c) the data bucket is not last but we have buffered data already.
      */
     if (bytes > 0
         && (count > 1
-            || (count == 1 && endb == APR_BRIGADE_SENTINEL(bb)))) {
+            || (endb == APR_BRIGADE_SENTINEL(bb))
+            || (ctx && ctx->bytes > 0))) {
         /* If coalescing some bytes, ensure a context has been
          * created. */
         if (!ctx) {