From 3b7a8f015be74aad44a2b897989e19d2a6fc0894 Mon Sep 17 00:00:00 2001
From: "timeless@mozdev.org" <timeless@mozdev.org>
Date: Thu, 15 Jan 2009 20:02:20 -0800
Subject: [PATCH] Bug 368130 Bogus "SSL is disabled" error when SSL3 is
 disabled, r=kaie

---
 security/manager/ssl/src/nsNSSIOLayer.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
index dc73ab0a662d..c7411c0d35b7 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -1479,7 +1479,15 @@ nsSSLIOLayerHelpers::rememberPossibleTLSProblemSite(PRFileDesc* ssl_layer_fd, ns
   PRBool currentlyUsesTLS = PR_FALSE;
 
   SSL_OptionGet(ssl_layer_fd, SSL_ENABLE_TLS, &currentlyUsesTLS);
-  if (currentlyUsesTLS) {
+  if (!currentlyUsesTLS)
+    return PR_FALSE;
+
+  PRBool enableSSL3 = PR_FALSE;
+  SSL_OptionGet(ssl_layer_fd, SSL_ENABLE_SSL3, &enableSSL3);
+  PRBool enableSSL2 = PR_FALSE;
+  SSL_OptionGet(ssl_layer_fd, SSL_ENABLE_SSL2, &enableSSL2);
+  if (enableSSL3 || enableSSL2)
+  {
     // Add this site to the list of TLS intolerant sites.
     PRInt32 port;
     nsXPIDLCString host;