From: Joe Orton Date: Fri, 12 Jul 2019 08:17:58 +0000 (+0000) Subject: Done. X-Git-Tag: 2.4.40~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13389800395b90db220e5f909afca2b353ebae6b;p=thirdparty%2Fapache%2Fhttpd.git Done. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1862959 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index c6223cd24ed..77d26128c61 100644 --- a/STATUS +++ b/STATUS @@ -153,11 +153,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1851146 ^/httpd/httpd/trunk . +1: jailletc36, jim, icing - *) core: Fix a compilation error when GPROF is defined. - trunk patch: http://svn.apache.org/r1857859 - 2.4.x patch: svn merge -c 1857859 ^/httpd/httpd/trunk . - +1: jailletc36, icing, jim - *) mod_proxy_hcheck fix for BZ 60948 trunk: http://svn.apache.org/r1862014 2.4.x: svn merge -c 1862014 ^/httpd/httpd/trunk .