Ruby 2.3 will support this feature to reduce allocations
for common errors.
---
lib/yahns/openssl_client.rb | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/lib/yahns/openssl_client.rb b/lib/yahns/openssl_client.rb
index ffa4b3e..246b407 100644
--- a/lib/yahns/openssl_client.rb
+++ b/lib/yahns/openssl_client.rb
@@ -53,14 +53,9 @@ module Yahns::OpenSSLClient # :nodoc:
if @need_accept
# most protocols require read before write, so we start the negotiation
# process here:
- begin
- @ssl.accept_nonblock
- rescue IO::WaitReadable
- return :wait_readable
- rescue IO::WaitWritable
- return :wait_writable
- rescue OpenSSL::SSL::SSLError
- return nil
+ case rv = accept_nonblock(@ssl)
+ when :wait_readable, :wait_writable, nil
+ return rv
end
@need_accept = false
end
@@ -71,4 +66,20 @@ module Yahns::OpenSSLClient # :nodoc:
@ssl.close # flushes SSLSocket
super # IO#close
end
+
+ if RUBY_VERSION.to_f >= 2.3
+ def accept_nonblock(ssl)
+ ssl.accept_nonblock(exception: false)
+ end
+ else
+ def accept_nonblock(ssl)
+ ssl.accept_nonblock
+ rescue IO::WaitReadable
+ :wait_readable
+ rescue IO::WaitWritable
+ :wait_writable
+ rescue OpenSSL::SSL::SSLError
+ nil
+ end
+ end
end
--
EW
--
unsubscribe: yahns-public+unsubscr...@yhbt.net
archive: http://yhbt.net/yahns-public/
