]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Pull Jeff's vote, re-propose based on the entire twisted history of the changes
authorWilliam A. Rowe Jr <wrowe@apache.org>
Wed, 26 Jun 2013 18:16:02 +0000 (18:16 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Wed, 26 Jun 2013 18:16:02 +0000 (18:16 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1497031 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index abab7b5dbb5622382206f04713f92c4243c0912c..6b83cabeccaed0ed5ce034e2a90816f691001656 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -137,12 +137,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: rjung
      -1: wrowe [it doesn't seem appropriate to add the alternate, less secure
                 template to a branch which people shouldn't be deploying in
-                the first place.  I'm +1 on the -SSLv2 change alone, e.g.
-                http://people.apache.org/~wrowe/2.0-ssl-noV2.patch ]
+                the first place.  See simplified and more complete proposal
+                below]
+
+   * Alternate: -SSLv2, Simplify SSLCipherSuite, corresponding docs fix,
+     MSIE downgrade changes
+     r966160, r1135234, r1203752, r966055, r1132793
+     http://people.apache.org/~wrowe/https-std-2.0.patch
+     +1: wrowe
 
-   * Alternate: -SSLv2 change alone
-     http://people.apache.org/~wrowe/2.0-ssl-noV2.patch     
-     +1: wrowe, trawick
 
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON: