From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 19 Aug 2021 13:43:23 +0000 (+0000)
Subject: core: don't break out iovec coalescing for metadata in ap_core_output_filter().
X-Git-Tag: 2.5.0-alpha2-ci-test-only~866
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90f1db58da55d572e225a85964fdff5212e78c4d;p=thirdparty%2Fapache%2Fhttpd.git

core: don't break out iovec coalescing for metadata in ap_core_output_filter().

* server/core_filters.c (send_brigade_nonblocking):
  Keep filling in the iovec when the next bucket has no ->length.


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

diff --git a/server/core_filters.c b/server/core_filters.c
index 7c3fa96fef2..0325dea452d 100644
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -604,7 +604,7 @@ static apr_status_t send_brigade_nonblocking(apr_socket_t *s,
          */
         if (nbytes > sconf->flush_max_threshold
                 && next != APR_BRIGADE_SENTINEL(bb)
-                && !is_in_memory_bucket(next)) {
+                && next->length && !is_in_memory_bucket(next)) {
             (void)apr_socket_opt_set(s, APR_TCP_NOPUSH, 1);
             rv = writev_nonblocking(s, bb, ctx, nbytes, nvec, c);
             if (rv != APR_SUCCESS) {