]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Propose same v3 patch as 2.4.x which adjusts CHANGES entry.
authorYann Ylavic <ylavic@apache.org>
Wed, 17 Jun 2015 10:34:15 +0000 (10:34 +0000)
committerYann Ylavic <ylavic@apache.org>
Wed, 17 Jun 2015 10:34:15 +0000 (10:34 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1685990 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index fd0537255216aa8274a397ab2477d3ae8fec4699..b4c8f4e8a50485e336ef16a0e6d8b889e9b30039 100644 (file)
--- 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: