nagachika	2016-03-29 01:20:43 +0900 (Tue, 29 Mar 2016)

  New Revision: 54332

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

  Log:
    merge revision(s) 54097: [Backport #12069]
    
    * ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe
      [ruby-core:73803] [Bug #12069]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/openssl/ossl_ssl.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ext/openssl/ossl_ssl.c
===================================================================
--- ruby_2_2/ext/openssl/ossl_ssl.c	(revision 54331)
+++ ruby_2_2/ext/openssl/ossl_ssl.c	(revision 54332)
@@ -685,8 +685,8 @@ ssl_info_cb(const SSL *ssl, int where, i https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/openssl/ossl_ssl.c#L685
  *    ctx.setup => nil # thereafter
  *
  * This method is called automatically when a new SSLSocket is created.
- * Normally you do not need to call this method (unless you are writing an
- * extension in C).
+ * However, it is not thread-safe and must be called before creating
+ * SSLSocket objects in a multi-threaded program.
  */
 static VALUE
 ossl_sslctx_setup(VALUE self)
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54331)
+++ ruby_2_2/version.h	(revision 54332)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 274
+#define RUBY_PATCHLEVEL 275
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54331)
+++ ruby_2_2/ChangeLog	(revision 54332)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Mar 29 01:20:37 2016  Eric Wong  <e@8...>
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe
+	  [ruby-core:73803] [Bug #12069]
+
 Tue Mar 29 01:07:36 2016  NARUSE, Yui  <naruse@r...>
 
 	* insns.def (opt_mod): show its method name on ZeroDivisionError.

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54097


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