diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 11:08:17 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 11:08:17 +0000 |
| commit | 7e9ce9f5d68d0a6129147e7cd69490554c6e7ae3 (patch) | |
| tree | 0fe814f468b4c4e53b021348e93cf86e6415451c | |
| parent | a6b6f9bb5941bb616608729fa9678b08d23e4c56 (diff) | |
merge revision(s) 49099: [Backport #10046]
* test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):
fix test failure with OpenSSL disabled SSLv3 protocol.
[ruby-core:63772] [Bug #10046]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/openssl/test_ssl_session.rb | 2 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Wed Nov 18 20:04:50 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + + * test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb): + fix test failure with OpenSSL disabled SSLv3 protocol. + [ruby-core:63772] [Bug #10046] + Thu Oct 29 23:54:35 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (sym_to_proc), proc.c (rb_block_clear_env_self): clear diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb index 69a3a0d876..5d08e7f780 100644 --- a/test/openssl/test_ssl_session.rb +++ b/test/openssl/test_ssl_session.rb @@ -273,7 +273,7 @@ __EOS__ def test_ctx_client_session_cb called = {} - ctx = OpenSSL::SSL::SSLContext.new("SSLv3") + ctx = OpenSSL::SSL::SSLContext.new ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT ctx.session_new_cb = lambda { |ary| @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.8" -#define RUBY_RELEASE_DATE "2015-10-29" -#define RUBY_PATCHLEVEL 412 +#define RUBY_RELEASE_DATE "2015-11-18" +#define RUBY_PATCHLEVEL 413 #define RUBY_RELEASE_YEAR 2015 -#define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_MONTH 11 +#define RUBY_RELEASE_DAY 18 #include "ruby/version.h" |