* ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): show openssl error
code in EWOULDBLOCK error. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
67d66b2652
commit
021aaa70d6
@ -1,3 +1,8 @@
|
|||||||
|
Wed Dec 31 17:16:46 2008 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
|
* ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): show openssl error
|
||||||
|
code in EWOULDBLOCK error.
|
||||||
|
|
||||||
Wed Dec 31 15:45:18 2008 Tanaka Akira <akr@fsij.org>
|
Wed Dec 31 15:45:18 2008 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* io.c (copy_stream_body): don't check to_io because
|
* io.c (copy_stream_body): don't check to_io because
|
||||||
|
@ -1024,14 +1024,14 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
|
|||||||
case SSL_ERROR_WANT_WRITE:
|
case SSL_ERROR_WANT_WRITE:
|
||||||
if (nonblock) {
|
if (nonblock) {
|
||||||
errno = EWOULDBLOCK;
|
errno = EWOULDBLOCK;
|
||||||
rb_sys_fail(0);
|
rb_sys_fail("SSL_ERROR_WANT_WRITE");
|
||||||
}
|
}
|
||||||
rb_io_wait_writable(FPTR_TO_FD(fptr));
|
rb_io_wait_writable(FPTR_TO_FD(fptr));
|
||||||
continue;
|
continue;
|
||||||
case SSL_ERROR_WANT_READ:
|
case SSL_ERROR_WANT_READ:
|
||||||
if (nonblock) {
|
if (nonblock) {
|
||||||
errno = EWOULDBLOCK;
|
errno = EWOULDBLOCK;
|
||||||
rb_sys_fail(0);
|
rb_sys_fail("SSL_ERROR_WANT_READ");
|
||||||
}
|
}
|
||||||
rb_io_wait_readable(FPTR_TO_FD(fptr));
|
rb_io_wait_readable(FPTR_TO_FD(fptr));
|
||||||
continue;
|
continue;
|
||||||
|
@ -146,7 +146,15 @@ class OpenSSL::TestPair < Test::Unit::TestCase
|
|||||||
|
|
||||||
def test_read_nonblock
|
def test_read_nonblock
|
||||||
ssl_pair {|s1, s2|
|
ssl_pair {|s1, s2|
|
||||||
assert_raise(Errno::EWOULDBLOCK) { s2.read_nonblock(10) }
|
err = nil
|
||||||
|
assert_raise(Errno::EWOULDBLOCK) {
|
||||||
|
begin
|
||||||
|
s2.read_nonblock(10)
|
||||||
|
ensure
|
||||||
|
err = $!
|
||||||
|
end
|
||||||
|
}
|
||||||
|
assert_match(/SSL_ERROR_WANT_READ/, err.message)
|
||||||
s1.write "abc\ndef\n"
|
s1.write "abc\ndef\n"
|
||||||
assert_equal("ab", s2.read_nonblock(2))
|
assert_equal("ab", s2.read_nonblock(2))
|
||||||
assert_equal("c\n", s2.gets)
|
assert_equal("c\n", s2.gets)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user