From: Yann Ylavic Date: Fri, 8 Sep 2017 13:08:14 +0000 (+0000) Subject: Backported. X-Git-Tag: 2.4.28~42 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e873ec9a6ae2ba9ef3da01813d85a115f26be0e6;p=apache Backported. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807752 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 3a9f009f3e..367beb3451 100644 --- a/STATUS +++ b/STATUS @@ -119,13 +119,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1801594 ^/httpd/httpd/trunk . +1: jfclere, jim, covener - *) ssl, ab: Compatibility with LibreSSL. PR 61184 and PR 61206. - trunk patch: http://svn.apache.org/r1803392 - http://svn.apache.org/r1803396 - http://svn.apache.org/r1803398 - 2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-libressl.patch - +1: ylavic, jim, covener - *) core: Follow up to r1739201. These APR_TIMEUP special cases are now handled by ap_map_http_request_error(). (r1739201 has been backported in the 2.4 branch in r1768079)