From 6bf58b4bf335edad627869604908f114dbadf01d Mon Sep 17 00:00:00 2001 From: tenderlove Date: Wed, 19 Aug 2015 14:59:58 +0000 Subject: * ext/openssl/lib/openssl/ssl.rb (module OpenSSL): add OP_ALL to existing options rather than just setting it. Some vendors apply custom patches to their versions of OpenSSL that set default values for options. This commit respects the custom patches they've applied. * test/openssl/test_ssl.rb (class OpenSSL): check that OP_ALL has been added to the options. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/lib/openssl/ssl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/openssl/lib') diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb index 03d0ebeef2..631943cc3f 100644 --- a/ext/openssl/lib/openssl/ssl.rb +++ b/ext/openssl/lib/openssl/ssl.rb @@ -111,7 +111,7 @@ module OpenSSL # You can get a list of valid methods with OpenSSL::SSL::SSLContext::METHODS def initialize(version = nil) INIT_VARS.each { |v| instance_variable_set v, nil } - self.options = OpenSSL::SSL::OP_ALL + self.options = self.options | OpenSSL::SSL::OP_ALL return unless version self.ssl_version = version end -- cgit v1.2.3