From: Rainer Jung <rjung@apache.org>
Date: Wed, 26 Jun 2013 20:33:59 +0000 (+0000)
Subject: Remove previous proposal, now replaced with
X-Git-Tag: 2.0.65~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2344ef7943f076d571767c316db87daab0b65928;p=thirdparty%2Fapache%2Fhttpd.git

Remove previous proposal, now replaced with
a more consensus oriented one.

Vote.


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

diff --git a/STATUS b/STATUS
index 6b83cabecca..6e1a318e603 100644
--- a/STATUS
+++ b/STATUS
@@ -124,27 +124,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     identify exactly what the proposed changes are!  Add all new
     proposals to the end of this list. ]
 
-   * mod_ssl: Update default config (Cipher suite, commented SSLHonorCipherOrder
-     example, better MSIE version match)
-     PR 51363 and 49484.
-     trunk patch: http://svn.apache.org/r966055
-                  http://svn.apache.org/r966160
-                  http://svn.apache.org/r1132793
-                  http://svn.apache.org/r1135234
-                  http://svn.apache.org/r1203752
-     2.2.x patch: http://svn.apache.org/r1227293
-     2.0.x patch: http://people.apache.org/~rjung/patches/2.0-ssl-conf.patch
-     +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.  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
+     +1: wrowe, rjung
 
 
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON: