From 00aff4d8bcfb1b3b1d2d9b9980163fad7d271950 Mon Sep 17 00:00:00 2001 From: drbrain Date: Tue, 27 Aug 2013 19:54:53 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ ext/openssl/ossl_ssl.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b1937ed34e..ac0feaa8d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 28 04:54:33 2013 Eric Hodel + + * ext/openssl/ossl_ssl.c (ossl_ssl_read): Replace duplicate + wait_writable with wait_readable. + Tue Aug 27 17:18:40 2013 Nobuyoshi Nakada * 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.