2 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 62cb4c527a..c72ef38f88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 11 07:33:30 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb (Net::HTTP::SSL_ATTRIBUTES):  Use symbol keys instead
+	  of string keys to avoid duplicating parameters in
+          OpenSSL::SSL:SSLContext#set_params.
+
 Thu Nov 10 15:02:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (have_library, have_func, have_var, have_header):
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 2172bfccc0..1c594e0e4d 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -674,10 +674,19 @@ module Net   #:nodoc:
       @use_ssl = flag
     end
 
-    SSL_ATTRIBUTES = %w(
-      ssl_version key cert ca_file ca_path cert_store ciphers
-      verify_mode verify_callback verify_depth ssl_timeout
-    )
+    SSL_ATTRIBUTES = [
+      :ca_file,
+      :ca_path,
+      :cert,
+      :cert_store,
+      :ciphers,
+      :key,
+      :ssl_timeout,
+      :ssl_version,
+      :verify_callback,
+      :verify_depth,
+      :verify_mode,
+    ]
 
     # Sets path of a CA certification file in PEM format.
     #