From 46e4b241f9316042dd2f166cb3cedb874817f6b6 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@apache.org>
Date: Tue, 15 Jul 2014 13:33:37 +0000
Subject: [PATCH] Collect -0117 patches... can I make conditional votes?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1610691 13f79535-47bb-0310-9956-ffa450edef68
---
 STATUS | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/STATUS b/STATUS
index 1f55c69abf..5d5f2a6f3b 100644
--- a/STATUS
+++ b/STATUS
@@ -96,6 +96,15 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
+   * mod_proxy Connection handling crasher, CVE-2014-0117
+   trunk patch: http://svn.apache.org/r1610674
+   ALTERNATIVE #1
+   2.4.x patch: http://people.apache.org/~jorton/CVE-2014-0117-simple.patch
+   +1: jorton, jim
+
+   ALTERNATIVE #2
+   2.4.x patch: http://people.apache.org/~jorton/2.4.x-CVE-2014-0117_v2.patch (ylavic)
+   +1: jorton
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
-- 
2.40.0