From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 15 May 2015 15:10:02 +0000 (+0000)
Subject: Redundancy here is not a bad thing, re-accept
X-Git-Tag: 2.2.30~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=257c990b0ac4d5025bd7eaff27bbfa69c5059e0c;p=thirdparty%2Fapache%2Fhttpd.git

Redundancy here is not a bad thing, re-accept

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

diff --git a/STATUS b/STATUS
index 74c0d78bcb9..d7737a0df95 100644
--- a/STATUS
+++ b/STATUS
@@ -171,10 +171,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1666363
                   http://svn.apache.org/r1679470
      2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_ssl-improved_EDH-v2.patch
-     +1: ylavic
+     +1: ylavic, wrowe
      ylavic: tested with openssl 0.9.7a, 0.9.8o, 1.0.1m and 1.0.2a with 1024
              and 2048 bits certificates (modulus), using EDH and ECDH ciphers.
-             v2 to include r1679470 (wrowe vote discarded)
+             v2 to include r1679470
 
    * core: Avoid potential use of uninitialized (NULL) request data in
      request line error path.