diff options
| author | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2022-10-07 23:05:17 +1300 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2022-10-17 16:35:35 +0900 |
| commit | aecc470a3354bbf61e5cd2e65f4aeb4f3825a9be (patch) | |
| tree | d4ff5e798ac05278ae33e2b6306afe81ee09c813 /ext | |
| parent | 17998ad3bb5864db38ba9e709ed7209da6189f0f (diff) | |
| download | ruby-aecc470a3354bbf61e5cd2e65f4aeb4f3825a9be.tar.gz | |
[ruby/openssl] Use default `IO#timeout` if possible.
https://github.com/ruby/openssl/commit/471340f612
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index a202109b7a..478ff869a4 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -1701,15 +1701,16 @@ no_exception_p(VALUE opts) return 0; } -#ifndef RB_IO_TIMEOUT_DEFAULT -#define RB_IO_TIMEOUT_DEFAULT Qnil +// Provided by Ruby 3.2.0 and later in order to support the default IO#timeout. +#ifndef RUBY_IO_TIMEOUT_DEFAULT +#define RUBY_IO_TIMEOUT_DEFAULT Qnil #endif static void io_wait_writable(rb_io_t *fptr) { #ifdef HAVE_RB_IO_MAYBE_WAIT - rb_io_maybe_wait_writable(errno, fptr->self, RB_IO_TIMEOUT_DEFAULT); + rb_io_maybe_wait_writable(errno, fptr->self, RUBY_IO_TIMEOUT_DEFAULT); #else rb_io_wait_writable(fptr->fd); #endif @@ -1719,7 +1720,7 @@ static void io_wait_readable(rb_io_t *fptr) { #ifdef HAVE_RB_IO_MAYBE_WAIT - rb_io_maybe_wait_readable(errno, fptr->self, RB_IO_TIMEOUT_DEFAULT); + rb_io_maybe_wait_readable(errno, fptr->self, RUBY_IO_TIMEOUT_DEFAULT); #else rb_io_wait_readable(fptr->fd); #endif |