From: Yann Ylavic Date: Fri, 11 Dec 2020 14:49:46 +0000 (+0000) Subject: Backported. [skip ci] X-Git-Tag: 2.4.47~205 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4601fa3ddb601cc378ef0f7d57dc746cc49b3b30;p=thirdparty%2Fapache%2Fhttpd.git Backported. [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1884319 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 70003ec20ab..c11a3fb97dd 100644 --- a/STATUS +++ b/STATUS @@ -145,12 +145,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: Backport version for 2.4.x of patch: +1: jailletc36, giovanni, ylavic - *) mod_http2: stop/wait the workers threads before their pool is killed. - trunk patch: https://svn.apache.org/r1884169 - https://svn.apache.org/r1884170 - 2.4.x patch: svn merge -c 1884169,1884170 ^/httpd/httpd/trunk . - +1: ylavic, jorton, covener - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ]