From 976a5e5525f689c6fb5a15bcb3eccbc0f6e3f80f Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Fri, 5 Jul 2019 07:21:48 +0000 Subject: [PATCH] vote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1862589 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/STATUS b/STATUS index 3c415a6f746..a7e9eaaa106 100644 --- a/STATUS +++ b/STATUS @@ -132,6 +132,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x: svn merge -c 1861690 ^/httpd/httpd/trunk . +1: jorton, jfclere, icing + *) 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: svn merge -c 1491700,1862200 ^/httpd/httpd/trunk . works [needs CHANGES] + +1: jorton, jim, icing + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -204,13 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1426802,1744460,1829799,1824716,1838318,1840678,1861294 ^/httpd/httpd/trunk . +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: svn merge -c 1491700,1862200 ^/httpd/httpd/trunk . works [needs CHANGES] - +1: jorton, jim - *) mod_socache_shmcb: fix gcc 9 warnings trunk: http://svn.apache.org/r1858565 2.4.x: svn merge -c 1858565 ^/httpd/httpd/trunk . -- 2.47.3