From: Joe Orton Date: Fri, 2 Feb 2024 11:51:48 +0000 (+0000) Subject: Vote, done. X-Git-Tag: 2.4.59-rc1-candidate~81 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea7227f9ec24eda34db5e479d12b47df11efd439;p=thirdparty%2Fapache%2Fhttpd.git Vote, done. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915535 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 0a78f7dcb69..1b0c5e7162b 100644 --- a/STATUS +++ b/STATUS @@ -192,7 +192,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: https://svn.apache.org/r1874101 https://svn.apache.org/r1913838 svn merge -c 1874101,1913838 ^/httpd/httpd/trunk . - +1: ylavic, minfrin + +1: ylavic, minfrin, jorton ylavic: changes in ssl_private.h not needed if/after r1908537 is backported (below proposal), though they are harmless. See: https://lists.apache.org/thread/k924ql8c9ry1b9y94fpr2b0d5o6tmds6 @@ -201,11 +201,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: minfrin: r1908537 is backported, can you update this proposal clean? ylavic: done, votes reset - *) Fix compiler warnings triggered by clang. - trunk patch: http://svn.apache.org/r1909450 - 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-warnings-be-gone.patch - +1: minfrin, ylavic, jfclere - *) Add CGIScriptTimeout to mod_cgi. trunk patch: http://svn.apache.org/r1828172 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-add-CGIScriptTimeout.patch