]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Propose.
authorGraham Leggett <minfrin@apache.org>
Mon, 2 Mar 2015 19:15:24 +0000 (19:15 +0000)
committerGraham Leggett <minfrin@apache.org>
Mon, 2 Mar 2015 19:15:24 +0000 (19:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1663398 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index cf481ed580229233c229828c5500e3cbd0b585da..202ac2363156974f0e4e320ec2010b04baf50d15 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -257,6 +257,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic, covener
 
+  *) core: Add expression support to ErrorDocument. Switch from a fixed
+     sized 664 byte array per merge to a hash table.
+     trunk patch: http://svn.apache.org/r1661448
+     2.4.x patch: trunks works (module CHANGES)
+     minfrin: +1
+
   *) SECURITY: CVE-2015-0228 (cve.mitre.org)
      mod_lua: A maliciously crafted websockets PING after a script
      calls r:wsupgrade() can cause a child process crash.
@@ -265,6 +271,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Note: Technically CTR but it's a CVE.
      +1: covener
 
+
 OTHER PROPOSALS
 
    * A list of further possible backports can be found at: