summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-18 15:26:17 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-18 15:26:17 +0000
commit125fbea52203d1b2a85fdfbdb011f56ff876830c (patch)
tree63d6310778a29b8fa277c47ae66d2055a674fa6e
parent43e1316eb7c3f64797bc766ad45f4dff99b3cbdf (diff)
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
-rw-r--r--ext/openssl/ossl.c5
-rw-r--r--version.h6
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
@@ -994,6 +994,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"