From: Yann Ylavic Date: Sun, 18 Apr 2021 20:53:22 +0000 (+0000) Subject: Propose follow up to r1888928 (showtopper). [skip ci] X-Git-Tag: 2.4.47~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0bb8246b0c35d80e8465993495050c39159f120;p=thirdparty%2Fapache%2Fhttpd.git Propose follow up to r1888928 (showtopper). [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1888934 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 4c4ce77374d..83cce0c4d38 100644 --- a/STATUS +++ b/STATUS @@ -134,6 +134,12 @@ CURRENT RELEASE NOTES: RELEASE SHOWSTOPPERS: + *) mod_watchdog: Fix incomplete backport in r1888928. + trunk patch: http://svn.apache.org/r1876619 + http://svn.apache.org/r1876675 + 2.4.x patch: svn merge -c 1876619,1876675 ^/httpd/httpd/trunk . + +1: ylavic + PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] @@ -186,7 +192,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: and other alternatives have been discussed in PR 64339. If r1884505 is not the right fix, then it should be removed from trunk. Putting it here is a way to revive the discussion - + PATCHES/ISSUES THAT ARE BEING WORKED [ New entries should be added at the START of the list ]