nagachika	2014-06-24 01:03:42 +0900 (Tue, 24 Jun 2014)

  New Revision: 46525

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46525

  Log:
    merge revision(s) r45540: [Backport #9911]
    
    ossl.c: OPENSSL_LIBRARY_VERSION
    
    * ext/openssl/ossl.c (Init_openssl): add constant OPENSSL_LIBRARY_VERSION
      which tells the version running OpenSSL.  [EXPERIMENTAL]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ext/openssl/ossl.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ext/openssl/ossl.c
===================================================================
--- ruby_2_1/ext/openssl/ossl.c	(revision 46524)
+++ ruby_2_1/ext/openssl/ossl.c	(revision 46525)
@@ -1083,6 +1083,11 @@ Init_openssl() https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/openssl/ossl.c#L1083
     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)
      */
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46524)
+++ ruby_2_1/version.h	(revision 46525)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-06-24"
-#define RUBY_PATCHLEVEL 141
+#define RUBY_PATCHLEVEL 142
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45540


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/