From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 1 Apr 2020 12:53:36 +0000 (+0000)
Subject: ap_core_output_filter: follow up to r1875947: don't swallow bucket read EOF.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1539
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36c3f0fcd1fcf6b54f7ab52133432243739bcad6;p=thirdparty%2Fapache%2Fhttpd.git

ap_core_output_filter: follow up to r1875947: don't swallow bucket read EOF.

Morphing buckets don't return APR_EOF on read when exhausted, ignoring EOF
here could mask real errors (e.g. FILE bucket truncated under us).

Thanks rpluem/jorton!


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

diff --git a/server/core_filters.c b/server/core_filters.c
index 0c08303c7a3..bb02b207fab 100644
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -543,12 +543,6 @@ static apr_status_t send_brigade_nonblocking(apr_socket_t *s,
 
                 rv = apr_bucket_read(bucket, &data, &length, APR_BLOCK_READ);
             }
-            if (APR_STATUS_IS_EOF(rv)) {
-                /* Morphing bucket exhausted, next. */
-                apr_bucket_delete(bucket);
-                rv = APR_SUCCESS;
-                continue;
-            }
             if (rv != APR_SUCCESS) {
                 goto cleanup;
             }