Up to 2.4.55; fixes CVE-2022-37436, CVE-2022-36760, CVE-2006-20001

[packages/apache.git] / http2-500.patch

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