From: Ruediger Pluem Date: Wed, 17 Jan 2024 12:53:02 +0000 (+0000) Subject: * Comment X-Git-Tag: 2.4.59-rc1-candidate~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f40276ae236824993d21ef17c9f67fcce326ae1;p=thirdparty%2Fapache%2Fhttpd.git * Comment git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915288 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index ca60f42838a..34341a6f814 100644 --- a/STATUS +++ b/STATUS @@ -242,6 +242,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/r1915281 2.4.x patch: svn merge -c 1915281 ^/httpd/httpd/trunk . +1: icing, + rpluem says: This has conflict in modules/http2/h2_version.h. Otherwise + +1 from me on the backport. PATCHES/ISSUES THAT ARE BEING WORKED