diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-27 19:54:53 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-27 19:54:53 +0000 |
| commit | 00aff4d8bcfb1b3b1d2d9b9980163fad7d271950 (patch) | |
| tree | 2854c0f723f7fc6f0b57cad09b2e5dfa164a4074 | |
| parent | ba57274860e05b2738419d462464a699d3ef4463 (diff) | |
| download | ruby-00aff4d8bcfb1b3b1d2d9b9980163fad7d271950.tar.gz | |
* ext/openssl/ossl_ssl.c (ossl_ssl_read): Replace duplicate
wait_writable with wait_readable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Aug 28 04:54:33 2013 Eric Hodel <drbrain@segment7.net> + + * ext/openssl/ossl_ssl.c (ossl_ssl_read): Replace duplicate + wait_writable with wait_readable. + Tue Aug 27 17:18:40 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/timeout.rb (Timeout#timeout): skip rescue clause only when no diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index ccbb793cd6..77007ba691 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -1463,7 +1463,7 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self) * * A non-blocking version of #sysread. Raises an SSLError if reading would * block. If "exception: false" is passed, this method returns a symbol of - * :wait_writable, :wait_writable, or nil, rather than raising an exception. + * :wait_readable, :wait_writable, or nil, rather than raising an exception. * * Reads +length+ bytes from the SSL connection. If a pre-allocated +buffer+ * is provided the data will be written into it. |