From: Joe Orton Date: Tue, 15 Dec 2020 09:22:15 +0000 (+0000) Subject: Backported*1, [skip ci] X-Git-Tag: 2.4.47~193 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c43518501228e0868d8dbbb4812750199a21e96d;p=thirdparty%2Fapache%2Fhttpd.git Backported*1, [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1884451 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 3c91d7c3081..9e27847992c 100644 --- a/STATUS +++ b/STATUS @@ -145,11 +145,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: Backport version for 2.4.x of patch: +1: jailletc36, giovanni, ylavic - *) mod_unique_id: Use base64url encoding for UNIQUE_ID - trunk patch: https://svn.apache.org/r1883947 - 2.4.x patch: svn merge -c 1883947 ^/httpd/httpd/trunk . - +1: jorton, ylavic, covener - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ]