diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-23 14:19:51 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-23 14:19:51 +0000 |
| commit | 4c4347e6987a5f6170c2a9008acc60eaed7301db (patch) | |
| tree | 162f7417fc08bc3e2a2b9d0431b9f360ec95464e /ChangeLog | |
| parent | a84ea119868a36ed02761f9fcbd929de3d828205 (diff) | |
| download | ruby-4c4347e6987a5f6170c2a9008acc60eaed7301db.tar.gz | |
* ext/openssl/extconf.rb (CRYPTO_THREADID): check exist or not.
* ext/openssl/ossl.c (ossl_thread_id): use rb_nativethread_self()
implemented at r42137 to allow threads which doesn't associated with
Ruby thread to use openssl functions.
* ext/openssl/ossl.c (Init_ossl_locks): If CRYPTO_THREADID is defined
(OpenSSL 1.0.0 or later has it) use CRYPTO_THREADID_set_callback()
instead of CRYPTO_set_id_callback() because its argument is
unsigned long; it may cause id collision on mswin64
whose sizeof(unsigned long) < sizeof(void*).
http://www.openssl.org/docs/crypto/threads.html
* ext/openssl/ossl.c (ossl_threadid_func): defined for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -1,3 +1,20 @@ +Tue Jul 23 23:19:24 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/openssl/extconf.rb (CRYPTO_THREADID): check exist or not. + + * ext/openssl/ossl.c (ossl_thread_id): use rb_nativethread_self() + implemented at r42137 to allow threads which doesn't associated with + Ruby thread to use openssl functions. + + * ext/openssl/ossl.c (Init_ossl_locks): If CRYPTO_THREADID is defined + (OpenSSL 1.0.0 or later has it) use CRYPTO_THREADID_set_callback() + instead of CRYPTO_set_id_callback() because its argument is + unsigned long; it may cause id collision on mswin64 + whose sizeof(unsigned long) < sizeof(void*). + http://www.openssl.org/docs/crypto/threads.html + + * ext/openssl/ossl.c (ossl_threadid_func): defined for above. + Tue Jul 23 20:47:36 2013 Tanaka Akira <akr@fsij.org> * bignum.c: Move functions. |