From: Yann Ylavic Date: Wed, 8 Sep 2021 08:12:44 +0000 (+0000) Subject: Accepted [skip ci]. X-Git-Tag: candidate-2.4.49-rc1~3^2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=871fe8869b079602dee9385ba4f53b048a384f6d;p=thirdparty%2Fapache%2Fhttpd.git Accepted [skip ci]. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1893105 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index f6f7b24ad3c..8666ff12f10 100644 --- a/STATUS +++ b/STATUS @@ -163,6 +163,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1893016 ^/httpd/httpd/trunk . +1: ylavic, covener, rpluem + *) mod_unique_id: Earlier request_time initialization in read_request_line(), + plus use of an atomic counter to close the race condition. + trunk patch: http://svn.apache.org/r1893001 + http://svn.apache.org/r1893002 + http://svn.apache.org/r1893004 + 2.4.x patch: svn merge -c 1893001,1893002,1893004 ^/httpd/httpd/trunk . + Reusing CHANGES entry from r1892982. + +1: ylavic, rpluem, gbechis PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -198,15 +206,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: but I cannot find them commented. Further more the PR currently has merge conflicts. - *) mod_unique_id: Earlier request_time initialization in read_request_line(), - plus use of an atomic counter to close the race condition. - trunk patch: http://svn.apache.org/r1893001 - http://svn.apache.org/r1893002 - http://svn.apache.org/r1893004 - 2.4.x patch: svn merge -c 1893001,1893002,1893004 ^/httpd/httpd/trunk . - Reusing CHANGES entry from r1892982. - +1: ylavic, rpluem, gbechis - *) core: Initialize the request fields on read failure to avoid NULLs. trunk patch: http://svn.apache.org/r1893030 http://svn.apache.org/r1893044