summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-23 02:40:17 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-23 02:40:17 +0000
commitc9447082ecbcab5dab9dcbcaa93686648008d8f8 (patch)
tree10f044d17a0bef18fe734164b9d2cf038fd9fed4 /ext
parentd0cf19d9ed3a84e20fc20f70e84d95218944d8e4 (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')
-rw-r--r--ext/openssl/lib/openssl/buffering.rb3
-rw-r--r--ext/openssl/ossl_ssl.c6
-rw-r--r--ext/socket/lib/socket.rb27
3 files changed, 12 insertions, 24 deletions
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index 9bd83f1..d773637 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 87a3dda..1ffd54b 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)
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index ec9a52c..ad7d1e7 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -315,8 +315,7 @@ class BasicSocket < IO
#
# By specifying a keyword argument _exception_ to +false+, you can indicate
# that sendmsg_nonblock should not raise an IO::WaitWritable exception, but
- # return the symbol +:wait_writable+ instead. At EOF, it will return +nil+
- # instead of raising EOFError.
+ # return the symbol +:wait_writable+ instead.
def sendmsg_nonblock(mesg, flags = 0, dest_sockaddr = nil, *controls,
exception: true)
__sendmsg_nonblock(mesg, flags, dest_sockaddr, controls, exception)
@@ -364,8 +363,7 @@ class BasicSocket < IO
#
# By specifying a keyword argument _exception_ to +false+, you can indicate
# that recv_nonblock should not raise an IO::WaitReadable exception, but
- # return the symbol +:wait_readable+ instead. At EOF, it will return +nil+
- # instead of raising EOFError.
+ # return the symbol +:wait_readable+ instead.
#
# === See
# * Socket#recvfrom
@@ -439,8 +437,7 @@ class BasicSocket < IO
#
# By specifying a keyword argument _exception_ to +false+, you can indicate
# that recvmsg_nonblock should not raise an IO::WaitReadable exception, but
- # return the symbol +:wait_readable+ instead. At EOF, it will return +nil+
- # instead of raising EOFError.
+ # return the symbol +:wait_readable+ instead.
def recvmsg_nonblock(dlen = nil, flags = 0, clen = nil,
scm_rights: false, exception: true)
__recvmsg_nonblock(dlen, flags, clen, scm_rights, exception)
@@ -517,8 +514,7 @@ class Socket < BasicSocket
#
# By specifying a keyword argument _exception_ to +false+, you can indicate
# that recvfrom_nonblock should not raise an IO::WaitReadable exception, but
- # return the symbol +:wait_readable+ instead. At EOF, it will return +nil+
- # instead of raising EOFError.
+ # return the symbol +:wait_readable+ instead.
#
# === See
# * Socket#recvfrom
@@ -575,8 +571,7 @@ class Socket < BasicSocket
#
# By specifying a keyword argument _exception_ to +false+, you can indicate
# that accept_nonblock should not raise an IO::WaitReadable exception, but
- # return the symbol +:wait_readable+ instead. At EOF, it will return +nil+
- # instead of raising EOFError.
+ # return the symbol +:wait_readable+ instead.
#
# === See
# * Socket#accept
@@ -1195,8 +1190,7 @@ class Socket < BasicSocket
#
# By specifying a keyword argument _exception_ to +false+, you can indicate
# that connect_nonblock should not raise an IO::WaitWritable exception, but
- # return the symbol +:wait_writable+ instead. At EOF, it will return +nil+
- # instead of raising EOFError.
+ # return the symbol +:wait_writable+ instead.
#
# === See
# # Socket#connect
@@ -1254,8 +1248,7 @@ class UDPSocket < IPSocket
#
# By specifying a keyword argument _exception_ to +false+, you can indicate
# that recvfrom_nonblock should not raise an IO::WaitReadable exception, but
- # return the symbol +:wait_readable+ instead. At EOF, it will return +nil+
- # instead of raising EOFError.
+ # return the symbol +:wait_readable+ instead.
#
# === See
# * Socket#recvfrom
@@ -1296,8 +1289,7 @@ class TCPServer < TCPSocket
#
# By specifying a keyword argument _exception_ to +false+, you can indicate
# that accept_nonblock should not raise an IO::WaitReadable exception, but
- # return the symbol +:wait_readable+ instead. At EOF, it will return +nil+
- # instead of raising EOFError.
+ # return the symbol +:wait_readable+ instead.
#
# === See
# * TCPServer#accept
@@ -1338,8 +1330,7 @@ class UNIXServer < UNIXSocket
#
# By specifying a keyword argument _exception_ to +false+, you can indicate
# that accept_nonblock should not raise an IO::WaitReadable exception, but
- # return the symbol +:wait_readable+ instead. At EOF, it will return +nil+
- # instead of raising EOFError.
+ # return the symbol +:wait_readable+ instead.
#
# === See
# * UNIXServer#accept