From: Joe Orton <jorton@apache.org>
Date: Thu, 17 Jul 2014 10:52:03 +0000 (+0000)
Subject: Fooled by weird "svn merge" failing to fail... no this patch doesn't apply.
X-Git-Tag: 2.2.28~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83ccdd31e5ac725a2d643e431c02b4df985d60a3;p=thirdparty%2Fapache%2Fhttpd.git

Fooled by weird "svn merge" failing to fail... no this patch doesn't apply.


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

diff --git a/STATUS b/STATUS
index 42f146b76e1..fa5fa6be0cc 100644
--- a/STATUS
+++ b/STATUS
@@ -111,16 +111,16 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: covener, ylavic, jorton
 
 
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+
    * SECURITY: CVE-2014-0117 (cve.mitre.org)
      Fix crashing with mod_proxy Connection handling.
      trunk patch: http://svn.apache.org/r1610674
      2.4.x patch: http://svn.apache.org/r1610737 (simplified ver)
      2.2.x patch: 2.4 works
-     +1: covener, ylavic, jorton
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
+     +1: covener, ylavic
 
    * mod_proxy: Don't reuse a SSL backend connection whose SNI differs. PR 55782.
                 This may happen when ProxyPreserveHost is on and the proxy-worker