diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-23 02:40:17 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-23 02:40:17 +0000 |
| commit | c9447082ecbcab5dab9dcbcaa93686648008d8f8 (patch) | |
| tree | 10f044d17a0bef18fe734164b9d2cf038fd9fed4 /ext/openssl | |
| parent | d0cf19d9ed3a84e20fc20f70e84d95218944d8e4 (diff) | |
Revert r57690 except for read_nonblock
https://github.com/ruby/ruby/pull/1527#issuecomment-281867551
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/lib/openssl/buffering.rb | 3 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb index 9bd83f1732..d773637c0e 100644 --- a/ext/openssl/lib/openssl/buffering.rb +++ b/ext/openssl/lib/openssl/buffering.rb @@ -379,8 +379,7 @@ module OpenSSL::Buffering # # By specifying a keyword argument _exception_ to +false+, you can indicate # that write_nonblock should not raise an IO::Wait*able exception, but - # return the symbol +:wait_writable+ or +:wait_readable+ instead. At EOF, - # it will return +nil+ instead of raising EOFError. + # return the symbol +:wait_writable+ or +:wait_readable+ instead. def write_nonblock(s, exception: true) flush diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 87a3dda8b1..1ffd54b240 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -1601,8 +1601,7 @@ ossl_ssl_connect(VALUE self) * By specifying a keyword argument _exception_ to +false+, you can indicate * that connect_nonblock should not raise an IO::WaitReadable or * IO::WaitWritable exception, but return the symbol +:wait_readable+ or - * +:wait_writable+ instead. At EOF, it will return +nil+ instead of raising - * EOFError. + * +:wait_writable+ instead. */ static VALUE ossl_ssl_connect_nonblock(int argc, VALUE *argv, VALUE self) @@ -1650,8 +1649,7 @@ ossl_ssl_accept(VALUE self) * By specifying a keyword argument _exception_ to +false+, you can indicate * that accept_nonblock should not raise an IO::WaitReadable or * IO::WaitWritable exception, but return the symbol +:wait_readable+ or - * +:wait_writable+ instead. At EOF, it will return +nil+ instead of raising - * EOFError. + * +:wait_writable+ instead. */ static VALUE ossl_ssl_accept_nonblock(int argc, VALUE *argv, VALUE self) |