From cb1ed38f91ee3f30a98a69bb1706701631eb9825 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Wed, 17 Jun 2015 10:34:15 +0000 Subject: [PATCH] Propose same v3 patch as 2.4.x which adjusts CHANGES entry. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1685990 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/STATUS b/STATUS index fd053725521..b4c8f4e8a50 100644 --- a/STATUS +++ b/STATUS @@ -119,16 +119,17 @@ RELEASE SHOWSTOPPERS: jim notes: test framework errors due to 413->400 error change [test adjusted] *) core: Allow spaces after chunk-size for compatibility with implementations - using a pre-filled buffer, and log parsing failures at level INFO. + using a pre-filled buffer. trunk patch: http://svn.apache.org/r1685345 http://svn.apache.org/r1685347 http://svn.apache.org/r1685349 http://svn.apache.org/r1685350 - 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ap_http_filter_chunked.patch - 2.2.x patch: trunk works (modulo CHANGES) + 2.[24].x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ap_http_filter_chunked-v3.patch + (trunk works but CHANGES entry in the above patch is + better since the APLOG_INFO part is already included + in the CVE-2015-3183 patch) +1: ylavic - ylavic: Depends on CVE-2015-3183 above, trunk works afterward. - r1685339 included in the 2.4.x patch is not needed here. + ylavic: CVE-2015-3183 patch above must be applied first. PATCHES ACCEPTED TO BACKPORT FROM TRUNK: -- 2.47.2