From bcf87d43420ec83a3a532dfd3524c168aba08e91 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Tue, 1 Mar 2016 02:07:36 +0000 Subject: [PATCH] Follow up to r1727393: add missing (voted) change from trunk's r1723284. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1732990 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index 1f33e48f9e..19961697ef 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -1475,7 +1475,7 @@ struct coalesce_ctx { static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f, apr_bucket_brigade *bb) { - apr_bucket *e, *endb; + apr_bucket *e, *upto; apr_size_t bytes = 0; struct coalesce_ctx *ctx = f->ctx; unsigned count = 0; @@ -1505,7 +1505,7 @@ static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f, if (e->length) count++; /* don't count zero-length buckets */ bytes += e->length; } - endb = e; + upto = e; /* Coalesce the prefix, if: * a) more than one bucket is found to coalesce, or @@ -1514,7 +1514,7 @@ static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f, */ if (bytes > 0 && (count > 1 - || (endb == APR_BRIGADE_SENTINEL(bb)) + || (upto == APR_BRIGADE_SENTINEL(bb)) || (ctx && ctx->bytes > 0))) { /* If coalescing some bytes, ensure a context has been * created. */ @@ -1532,7 +1532,7 @@ static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f, * normal path of sending the buffer + remaining buckets in * brigade. */ e = APR_BRIGADE_FIRST(bb); - while (e != endb) { + while (e != upto) { apr_size_t len; const char *data; apr_bucket *next; -- 2.50.1