From 21e6e3ddfe2eb162dc11222debaa0218b2c4264b Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Fri, 16 Jun 2023 10:58:09 +0000 Subject: [PATCH] * Promote [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910447 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/STATUS b/STATUS index c86d15841ba..2c690de512f 100644 --- a/STATUS +++ b/STATUS @@ -152,7 +152,19 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + *) cmake build, improve libcurl detection (github PR 356) + trunk patch: https://svn.apache.org/r1909215 + 2.4.x patch: svn merge -c 1909215 ^/httpd/httpd/trunk . + +1: icing, rpluem, gbechis + *) mod_http2: avoid double chunked-encoding on internal redirects. + Fixes PR 66597. + Trunk version of patch: + https://svn.apache.org/r1909932 + https://svn.apache.org/r1909982 + Backport version for 2.4.x of patch: + svn merge -c 1909932,1909982 ^/httpd/httpd/trunk . + +1: icing, rpluem, gbechis PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -191,11 +203,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: https://github.com/apache/httpd/pull/350 +1: ylavic, rpluem, - *) cmake build, improve libcurl detection (github PR 356) - trunk patch: https://svn.apache.org/r1909215 - 2.4.x patch: svn merge -c 1909215 ^/httpd/httpd/trunk . - +1: icing, rpluem, gbechis - *) mod_rewrite: Add server directory to include path as mod_rewrite requires test_char.h. PR 66571 Trunk version of patch: @@ -235,15 +242,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: svn merge -c 1909769 ^/httpd/httpd/trunk . # minor conflicts +1: icing, - *) mod_http2: avoid double chunked-encoding on internal redirects. - Fixes PR 66597. - Trunk version of patch: - https://svn.apache.org/r1909932 - https://svn.apache.org/r1909982 - Backport version for 2.4.x of patch: - svn merge -c 1909932,1909982 ^/httpd/httpd/trunk . - +1: icing, rpluem, gbechis - *) mod_http2/mod_proxy_http2: upgrade to v2.0.18 Fixes crash in mod_proxy_http2 caused by use for wrong bucket_alloc Trunk version of patch: -- 2.47.2