diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-10 04:16:19 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-10 04:16:19 +0000 |
| commit | ce2b574017cacc2c3f2b0e92f82a7f250639fc34 (patch) | |
| tree | 7acabd562fa8d763524958a6c56db8d5599382d0 | |
| parent | 7d73136d066eca26c8d9fdd1afe8a826dadd270c (diff) | |
* ext/openssl/ossl_ssl.c (Init_ossl_ssl): add SSLContext#ssl_timeout=,
which allows net/https to specify timeout. [ruby-core:24812]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sat Apr 10 13:14:22 2010 Yusuke Endoh <mame@tsg.ne.jp> + + * ext/openssl/ossl_ssl.c (Init_ossl_ssl): add SSLContext#ssl_timeout=, + which allows net/https to specify timeout. [ruby-core:24812] + Sat Apr 10 07:36:13 2010 wanabe <s.wanabe@gmail.com> * vm_method.c (rb_add_method): clear attr.location before rb_ary_new3. diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index fe6e74fdbd..e70a868620 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -1577,6 +1577,7 @@ Init_ossl_ssl() for(i = 0; i < numberof(ossl_sslctx_attrs); i++) rb_attr(cSSLContext, rb_intern(ossl_sslctx_attrs[i]), 1, 1, Qfalse); rb_define_alias(cSSLContext, "ssl_timeout", "timeout"); + rb_define_alias(cSSLContext, "ssl_timeout=", "timeout="); rb_define_method(cSSLContext, "initialize", ossl_sslctx_initialize, -1); rb_define_method(cSSLContext, "ssl_version=", ossl_sslctx_set_ssl_version, 1); rb_define_method(cSSLContext, "ciphers", ossl_sslctx_get_ciphers, 0); |