From: Christophe Jaillet Date: Wed, 21 Apr 2021 09:22:11 +0000 (+0000) Subject: Add a comment on a backport proposal X-Git-Tag: 2.4.47~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e62e6a44c032bddc2c1b58a8616891058d073848;p=thirdparty%2Fapache%2Fhttpd.git Add a comment on a backport proposal [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1889049 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 7b1065cd7db..017cb8e4c7a 100644 --- a/STATUS +++ b/STATUS @@ -171,6 +171,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: +1: icing, ylavic ylavic: some "<<<<<<< HEAD" hunk in ap_mmn.h should be remove on backport.. + jailletc36: pull/179 has been updated with r1889009 *) mod_socache_shmcb: be safe from socache_shmcb_destroy() late call. PR 59798 trunk patch: http://svn.apache.org/r1888266