From: Jim Jagielski Date: Mon, 1 Jul 2019 15:37:12 +0000 (+0000) Subject: cast votes on tested patches X-Git-Tag: 2.4.40~79 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0bfb589d9cbb66224261d22d5f595e9208d55b3;p=thirdparty%2Fapache%2Fhttpd.git cast votes on tested patches git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1862388 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 2917765fd70..128b079f85b 100644 --- a/STATUS +++ b/STATUS @@ -167,7 +167,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1862040 http://svn.apache.org/r1862042 2.4.x patch: svn merge -c 1842010,1841225,1862039,1862040,1862042 ^/httpd/httpd/trunk . - +1: rpluem, jorton, + +1: rpluem, jorton, jim *) core: Split out the ability to parse wildcard files and directories from the Include/IncludeOptional directives into a generic set of @@ -189,7 +189,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: PR 53915 [Rein Tollevik ] trunk: http://svn.apache.org/r1851146 2.4.x patch: svn merge -c 1851146 ^/httpd/httpd/trunk . - +1: jailletc36 + +1: jailletc36, jim *) easy patches to synch 2.4.x and trunk: - core: extend description of r->hostname @@ -208,14 +208,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: - http://svn.apache.org/r1840678 - http://svn.apache.org/r1861294 2.4.x patch: svn merge -c 1426802,1744460,1829799,1824716,1838318,1840678,1861294 ^/httpd/httpd/trunk . - +1: jailletc36 + +1: jailletc36, jim *) Fix mod_mime_magic potential content-type corruption (seen in the wild), and update match for WAV files to work properly. trunk: http://svn.apache.org/r1491700 http://svn.apache.org/r1862200 2.4.x: trunk works [needs CHANGES] - +1: jorton, + +1: jorton, jim https://svn.apache.org/viewvc?view=revision&revision=1491700