http2-500.patch

   1 commit a829ac7f3f543ce6849d563aed4b6d602a7ca0e7
   2 Author: Stefan Eissing <icing@apache.org>
   3 Date:   Wed Jan 18 20:02:25 2023 +0000
   4
   5       *) mod_http2: client resets of HTTP/2 streams led to unwanted 500 errors
   6          reported in access logs and error documents. The processing of the
   7          reset was correct, only unneccesary reporting was caused.
   8
   9
  10
  11     git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1906775 13f79535-47bb-0310-9956-ffa450edef68
  12
  13 diff --git a/changes-entries/h2-rst-access-500-fix.txt b/changes-entries/h2-rst-access-500-fix.txt
  14 new file mode 100644
  15 index 0000000000..d165fa3bc8
  16 --- /dev/null
  17 +++ b/changes-entries/h2-rst-access-500-fix.txt
  18 @@ -0,0 +1,4 @@
  19 +  *) mod_http2: client resets of HTTP/2 streams led to unwanted 500 errors
  20 +     reported in access logs and error documents. The processing of the
  21 +     reset was correct, only unneccesary reporting was caused.
  22 +     [Stefan Eissing]
  23 diff --git a/modules/http2/h2_c2_filter.c b/modules/http2/h2_c2_filter.c
  24 index f537a19f07..37254fc1d7 100644
  25 --- a/modules/http2/h2_c2_filter.c
  26 +++ b/modules/http2/h2_c2_filter.c
  27 @@ -615,7 +615,7 @@ apr_status_t h2_c2_filter_catch_h1_out(ap_filter_t* f, apr_bucket_brigade* bb)
  28      ap_assert(conn_ctx);
  29      H2_FILTER_LOG("c2_catch_h1_out", f->c, APLOG_TRACE2, 0, "check", bb);
  30
  31 -    if (!conn_ctx->has_final_response) {
  32 +    if (!f->c->aborted && !conn_ctx->has_final_response) {
  33          if (!parser) {
  34              parser = apr_pcalloc(f->c->pool, sizeof(*parser));
  35              parser->id = apr_psprintf(f->c->pool, "%s-%d", conn_ctx->id, conn_ctx->stream_id);