From 3c669e2be96b2584c8dd713fd4d2bd44bad11f9f Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 19 Mar 2009 11:40:38 +0000 Subject: * io.c (rb_mWaitReadable): defined. (rb_mWaitWritable): defined. (io_getpartial): extend IO::WaitReadable on EWOULDBLOCK and EAGAIN. (rb_io_write_nonblock): extend IO::WaitWritable on EWOULDBLOCK and EAGAIN. * error.c (make_errno_exc): extracted from rb_sys_fail. (rb_mod_sys_fail): new function. * include/ruby/ruby.h (rb_mod_sys_fail): declared. (rb_mWaitReadable): declared. (rb_mWaitWritable): declared. * ext/socket/init.c (rsock_s_recvfrom_nonblock): extend IO::WaitReadable on EWOULDBLOCK and EAGAIN. (rsock_s_accept_nonblock): extend IO::WaitReadable on EWOULDBLOCK, EAGAIN, ECONNABORTED and EPROTO. * ext/socket/socket.c (sock_connect_nonblock): extend IO::WaitWritable on EINPROGRESS. * ext/socket/ancdata.c (bsock_sendmsg_internal): extend IO::WaitWritable on EWOULDBLOCK and EAGAIN. (bsock_recvmsg_internal): extend IO::WaitReadable on EWOULDBLOCK and EAGAIN. * ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): raise SSLError extended by IO::WaitReadable/IO::WaitWritable on SSL_ERROR_WANT_READ/SSL_ERROR_WANT_WRITE. * ext/openssl/ossl.c (ossl_make_error): extracted from ossl_raise. (ossl_exc_new): new function. * ext/openssl/ossl.h (ossl_exc_new): declared. * lib/net/protocol.rb (rbuf_fill): rescue IO::WaitReadable and IO::WaitWritable. [ruby-core:22539], [ruby-dev:38140] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_io.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 91da8c03c..f45677988 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -864,7 +864,7 @@ class TestIO < Test::Unit::TestCase begin r.read_nonblock 4096 rescue Errno::EWOULDBLOCK - assert_match(/WANT_READ/, $!.message) + assert_kind_of(IO::WaitReadable, $!) end } end @@ -877,7 +877,7 @@ class TestIO < Test::Unit::TestCase w.write_nonblock "a"*100000 } rescue Errno::EWOULDBLOCK - assert_match(/WANT_WRITE/, $!.message) + assert_kind_of(IO::WaitWritable, $!) end } end -- cgit