From: Ruediger Pluem Date: Wed, 17 Aug 2022 06:53:15 +0000 (+0000) Subject: * Vote X-Git-Tag: 2.4.55-rc1-candidate~98 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66ab488313cae4218529597364ff1ccc490cb6b6;p=thirdparty%2Fapache%2Fhttpd.git * Vote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1903476 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 1619aab2a42..66d833b53e6 100644 --- a/STATUS +++ b/STATUS @@ -198,7 +198,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: https://svn.apache.org/r1900691 https://svn.apache.org/r1900694 2.4.x patch: svn merge -c 1822857,1876815,1893499,1900024,1900152,1900306,1900559,1900564,1900691,1900694 ^/httpd/httpd/trunk . - +1: jailletc36, + +1: jailletc36, rpluem *) mod_heartmonitor: Allow "HeartbeatMaxServers 0" to use file based storage instead of slotmem. @@ -211,13 +211,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: https://svn.apache.org/r1902132 https://svn.apache.org/r1902133 2.4.x patch: svn merge -c 1902117,1902130,1902132,1902133 ^/httpd/httpd/trunk . - +1: rjung, + +1: rjung, rpluem *) mod_ssl: fix for PR66190. trunk revision: https://svn.apache.org/r1903167 PR: https://github.com/apache/httpd/pull/326 - +1: icing, + +1: icing, rpluem *) mod_http2: Export mod_http2.h Trunk version of patch: