VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-13 14:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow up to r1727393: add missing (voted) change from trunk's r1723284.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1732990 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2016-03-01 02:07:36 +00:00
parent 9bb00aee86
commit bcf87d4342
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ssl/ssl_engine_io.c
View File

@ -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;