]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Redundancy here is not a bad thing, re-accept
authorWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 15 May 2015 15:10:02 +0000 (15:10 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 15 May 2015 15:10:02 +0000 (15:10 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1679593 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 74c0d78bcb9e7bf83b28b9c28555972441effcee..d7737a0df95dcf26e997ccb8ff2e96c25aaab248 100644 (file)
--- 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.