diff options
| author | Samuel Williams <[email protected]> | 2021-06-19 13:47:16 +1200 |
|---|---|---|
| committer | Samuel Williams <[email protected]> | 2021-06-22 22:48:57 +1200 |
| commit | 45e65f302b663b2c6ab69df06d3b6f219c1797b2 (patch) | |
| tree | adf0ed3b3b9c92626f2c21a320ecdf66998b4c27 /ext/openssl/ossl_ssl.c | |
| parent | 3deb5d7113e1fd6e4b468e09464d524d390d811e (diff) | |
Deprecate and rework old (fd) centric functions.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4592
Diffstat (limited to 'ext/openssl/ossl_ssl.c')
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index c38142bfcc..0511579d7b 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -1639,12 +1639,12 @@ ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, VALUE opts) case SSL_ERROR_WANT_WRITE: if (no_exception_p(opts)) { return sym_wait_writable; } write_would_block(nonblock); - rb_io_wait_writable(fptr->fd); + rb_io_maybe_wait_writable(errno, fptr->self, Qnil); continue; case SSL_ERROR_WANT_READ: if (no_exception_p(opts)) { return sym_wait_readable; } read_would_block(nonblock); - rb_io_wait_readable(fptr->fd); + rb_io_maybe_wait_readable(errno, fptr->self, Qnil); continue; case SSL_ERROR_SYSCALL: #ifdef __APPLE__ @@ -1819,12 +1819,12 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock) case SSL_ERROR_WANT_WRITE: if (no_exception_p(opts)) { return sym_wait_writable; } write_would_block(nonblock); - rb_io_wait_writable(fptr->fd); + rb_io_maybe_wait_writable(errno, fptr->self, Qnil); continue; case SSL_ERROR_WANT_READ: if (no_exception_p(opts)) { return sym_wait_readable; } read_would_block(nonblock); - rb_io_wait_readable(fptr->fd); + rb_io_maybe_wait_readable(errno, fptr->self, Qnil); continue; case SSL_ERROR_SYSCALL: if (!ERR_peek_error()) { @@ -1935,12 +1935,12 @@ ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts) case SSL_ERROR_WANT_WRITE: if (no_exception_p(opts)) { return sym_wait_writable; } write_would_block(nonblock); - rb_io_wait_writable(fptr->fd); + rb_io_maybe_wait_writable(errno, fptr->self, Qnil); continue; case SSL_ERROR_WANT_READ: if (no_exception_p(opts)) { return sym_wait_readable; } read_would_block(nonblock); - rb_io_wait_readable(fptr->fd); + rb_io_maybe_wait_readable(errno, fptr->self, Qnil); continue; case SSL_ERROR_SYSCALL: #ifdef __APPLE__ |