From 125fbea52203d1b2a85fdfbdb011f56ff876830c Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 18 Sep 2014 15:26:17 +0000 Subject: merge revision(s) 45540: [Backport #9910] ossl.c: OPENSSL_LIBRARY_VERSION * ext/openssl/ossl.c (Init_openssl): add constant OPENSSL_LIBRARY_VERSION which tells the version running OpenSSL. [EXPERIMENTAL] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/ossl.c | 5 +++++ version.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index ed6153d869..d3b511dd10 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -993,6 +993,11 @@ Init_openssl() */ rb_define_const(mOSSL, "OPENSSL_VERSION", rb_str_new2(OPENSSL_VERSION_TEXT)); + /* + * Version of OpenSSL the ruby OpenSSL extension is running with + */ + rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(SSLeay_version(SSLEAY_VERSION))); + /* * Version number of OpenSSL the ruby OpenSSL extension was built with * (base 16) diff --git a/version.h b/version.h index 2eb98af54a..21503303c4 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-09-17" -#define RUBY_PATCHLEVEL 575 +#define RUBY_RELEASE_DATE "2014-09-19" +#define RUBY_PATCHLEVEL 576 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 19 #include "ruby/version.h" -- cgit v1.2.3