diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-31 18:55:07 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-31 18:55:07 +0000 |
| commit | a8b1b529f1042c8bf71ce2855147d92305c204f7 (patch) | |
| tree | ab197e1484267bc949dad742a5acdb9d311ec441 /version.h | |
| parent | a5a5494d25c6b7a0662a73b27bf1ab88fbbb42d0 (diff) | |
merge revision(s) 51569,51649: [Backport #11366] [Backport #11367]
test_ssl_session.rb: check SSL method
* test/openssl/test_ssl_session.rb (test_ctx_server_session_cb):
ensure the method to be tested is supported.
* test/openssl/test_ssl_session.rb: Fix tests so that they take in to
account OpenSSL installations that have SSLv3 disabled by default.
Thanks Jeremy Evans <code@jeremyevans.net> for the patches.
[Bug #11366] [Bug #11367]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.4" #define RUBY_RELEASE_DATE "2015-11-01" -#define RUBY_PATCHLEVEL 184 +#define RUBY_PATCHLEVEL 185 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 11 |