* [PATCH] openssl_client: use `exception: false' for accept_nonblock
@ 2015-12-13 2:17 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2015-12-13 2:17 UTC (permalink / raw)
To: yahns-public
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-12-13 2:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-13 2:17 [PATCH] openssl_client: use `exception: false' for accept_nonblock Eric Wong
Code repositories for project(s) associated with this public inbox
https://yhbt.net/yahns.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).