nagachika	2014-10-22 22:55:24 +0900 (Wed, 22 Oct 2014)

  New Revision: 48097

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48097

  Log:
    * ext/openssl/lib/openssl/ssl.rb (DEFAULT_PARAMS): override
      options even if OpenSSL::SSL::OP_NO_SSLv3 is not defined.
      this is pointed out by Stephen Touset. [ruby-core:65711] [Bug #9424]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/lib/openssl/ssl.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48096)
+++ ChangeLog	(revision 48097)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Oct 22 22:38:59 2014  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* ext/openssl/lib/openssl/ssl.rb (DEFAULT_PARAMS): override
+	  options even if OpenSSL::SSL::OP_NO_SSLv3 is not defined.
+	  this is pointed out by Stephen Touset. [ruby-core:65711] [Bug #9424]
+
 Wed Oct 22 21:31:56 2014  NAKAMURA Usaku  <usa@r...>
 
 	* common.mk (prelude.c): add dependency to LIB_SRCS because
Index: ext/openssl/lib/openssl/ssl.rb
===================================================================
--- ext/openssl/lib/openssl/ssl.rb	(revision 48096)
+++ ext/openssl/lib/openssl/ssl.rb	(revision 48097)
@@ -64,6 +64,7 @@ module OpenSSL https://github.com/ruby/ruby/blob/trunk/ext/openssl/lib/openssl/ssl.rb#L64
           opts |= OpenSSL::SSL::OP_NO_COMPRESSION if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
           opts |= OpenSSL::SSL::OP_NO_SSLv2 if defined?(OpenSSL::SSL::OP_NO_SSLv2)
           opts |= OpenSSL::SSL::OP_NO_SSLv3 if defined?(OpenSSL::SSL::OP_NO_SSLv3)
+          opts
         }.call
       }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/