From: Stefan Eissing <icing@apache.org>
Date: Thu, 11 Nov 2021 11:16:23 +0000 (+0000)
Subject:   *) mod_http2: always return an EOS bucket for requests
X-Git-Tag: 2.5.0-alpha2-ci-test-only~699
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a452f3b42ea5bdc1bbd36701ad7028775e3df0bd;p=thirdparty%2Fapache%2Fhttpd.git

  *) mod_http2: always return an EOS bucket for requests
     that have no body on c2 connection input filter.



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

diff --git a/modules/http2/h2_c2.c b/modules/http2/h2_c2.c
index fd0adb51c68..dd2e10b3214 100644
--- a/modules/http2/h2_c2.c
+++ b/modules/http2/h2_c2.c
@@ -269,14 +269,14 @@ static apr_status_t h2_c2_filter_in(ap_filter_t* f,
         return APR_ECONNABORTED;
     }
     
-    if (!conn_ctx->beam_in) {
-        return APR_EOF;
-    }
-
     if (!fctx) {
         fctx = apr_pcalloc(f->c->pool, sizeof(*fctx));
         f->ctx = fctx;
         fctx->bb = apr_brigade_create(f->c->pool, f->c->bucket_alloc);
+        if (!conn_ctx->beam_in) {
+            b = apr_bucket_eos_create(f->c->bucket_alloc);
+            APR_BRIGADE_INSERT_TAIL(fctx->bb, b);
+        }
     }
     
     /* Cleanup brigades from those nasty 0 length non-meta buckets