kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/openssl] Use default IO#timeout if possible.

Browse source 
471340f612
This commit is contained in:
Samuel Williams 2022-10-07 23:05:17 +13:00 • committed by Kazuki Yamaguchi
parent 17998ad3bb
commit aecc470a33
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ext/openssl/ossl_ssl.c
View file

@ -1701,15 +1701,16 @@ no_exception_p(VALUE opts)
return 0; return 0;
} }
#ifndef RB_IO_TIMEOUT_DEFAULT // Provided by Ruby 3.2.0 and later in order to support the default IO#timeout.
#define RB_IO_TIMEOUT_DEFAULT Qnil #ifndef RUBY_IO_TIMEOUT_DEFAULT
#define RUBY_IO_TIMEOUT_DEFAULT Qnil
#endif #endif
static void static void
io_wait_writable(rb_io_t *fptr) io_wait_writable(rb_io_t *fptr)
{ {
#ifdef HAVE_RB_IO_MAYBE_WAIT #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 #else
rb_io_wait_writable(fptr->fd); rb_io_wait_writable(fptr->fd);
#endif #endif
@ -1719,7 +1720,7 @@ static void
io_wait_readable(rb_io_t *fptr) io_wait_readable(rb_io_t *fptr)
{ {
#ifdef HAVE_RB_IO_MAYBE_WAIT #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 #else
rb_io_wait_readable(fptr->fd); rb_io_wait_readable(fptr->fd);
#endif #endif