From: Graham Leggett <minfrin@apache.org>
Date: Mon, 2 Mar 2015 19:15:24 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.4.13~377
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad329199a1ba958d32b396ebf2a69f70445bb291;p=thirdparty%2Fapache%2Fhttpd.git

Propose.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1663398 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index cf481ed5802..202ac236315 100644
--- 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: