]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
ap_core_output_filter: follow up to r1875947: don't swallow bucket read EOF.
authorYann Ylavic <ylavic@apache.org>
Wed, 1 Apr 2020 12:53:36 +0000 (12:53 +0000)
committerYann Ylavic <ylavic@apache.org>
Wed, 1 Apr 2020 12:53:36 +0000 (12:53 +0000)
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

server/core_filters.c

index 0c08303c7a3c6549627ce49ae15262cbeb9d3600..bb02b207fabcc4158f07d81506907c67d6a42d42 100644 (file)
@@ -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;
             }