diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 4 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Mar 29 01:20:37 2016 Eric Wong <e@80x24.org> + + * 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@ruby-lang.org> * insns.def (opt_mod): show its method name on ZeroDivisionError. diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 79e92fd76b..82e194a68d 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -685,8 +685,8 @@ ssl_info_cb(const SSL *ssl, int where, int val) * 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) @@ -1,6 +1,6 @@ #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 |