diff --git a/apache2-issue-444.patch b/apache2-issue-444.patch
new file mode 100644
index 0000000..c9a2736
--- /dev/null
+++ b/apache2-issue-444.patch
@@ -0,0 +1,36 @@
+Index: httpd-2.4.59/modules/generators/mod_cgid.c
+===================================================================
+--- httpd-2.4.59.orig/modules/generators/mod_cgid.c
++++ httpd-2.4.59/modules/generators/mod_cgid.c
+@@ -1625,7 +1625,12 @@ static int cgid_handler(request_rec *r)
+          */
+         if (!apr_table_get(r->subprocess_env, AP_TRUST_CGILIKE_CL_ENVVAR))
+             apr_table_unset(r->headers_out, "Content-Length");
+-        apr_table_unset(r->headers_out, "Transfer-Encoding");
++
++        if (apr_table_get(r->headers_out, "Transfer-Encoding") != NULL) {
++            apr_brigade_cleanup(bb);
++            return log_scripterror(r, conf, HTTP_BAD_GATEWAY, 0, APLOGNO(10501)
++                                   "script sent Transfer-Encoding");
++        }
+ 
+         if (ret != OK) {
+             ret = log_script(r, conf, ret, dbuf, sbuf, bb, NULL);
+Index: httpd-2.4.59/modules/generators/mod_cgi.c
+===================================================================
+--- httpd-2.4.59.orig/modules/generators/mod_cgi.c
++++ httpd-2.4.59/modules/generators/mod_cgi.c
+@@ -976,7 +976,12 @@ static int cgi_handler(request_rec *r)
+          */
+         if (!apr_table_get(r->subprocess_env, AP_TRUST_CGILIKE_CL_ENVVAR))
+             apr_table_unset(r->headers_out, "Content-Length");
+-        apr_table_unset(r->headers_out, "Transfer-Encoding");
++
++        if (apr_table_get(r->headers_out, "Transfer-Encoding") != NULL) {
++            apr_brigade_cleanup(bb);
++            return log_scripterror(r, conf, HTTP_BAD_GATEWAY, 0, APLOGNO(10501),
++                                   "script sent Transfer-Encoding");
++        }
+ 
+         if (ret != OK) {
+             ret = log_script(r, conf, ret, dbuf, sbuf, bb, script_err);
diff --git a/apache2.changes b/apache2.changes
index 717ed62..ab2d4f5 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun 13 13:34:23 UTC 2024 - pgajdos@suse.com
+
+- added patches [bsc#1226217]
+  https://github.com/apache/httpd/pull/444/commits/c2fffd29b0f58bdc9caaaff4fec68e17a676f182
+  + apache2-issue-444.patch
+
 -------------------------------------------------------------------
 Thu Apr  4 18:40:00 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
 
diff --git a/apache2.spec b/apache2.spec
index b4fde88..115718c 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -190,6 +190,8 @@ Patch100:       apache-test-application-xml-type.patch
 # even if in live system I do not experience this inconsistency, let's turn off
 # these variables from the test
 Patch101:       apache-test-turn-off-variables-in-ssl-var-lookup.patch
+# https://github.com/apache/httpd/pull/444/commits/c2fffd29b0f58bdc9caaaff4fec68e17a676f182
+Patch102:       apache2-issue-444.patch
 BuildRequires:  apache-rpm-macros-control
 #Since 2.4.7 the event MPM requires apr 1.5.0 or later.
 BuildRequires:  apr-devel >= 1.5.0