yahns Ruby server user/dev discussion
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] openssl_client: use `exception: false' for accept_nonblock
Date: Sun, 13 Dec 2015 02:17:12 +0000	[thread overview]
Message-ID: <20151213021712.17776-1-e@80x24.org> (raw)

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


                 reply	other threads:[~2015-12-13  2:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://yhbt.net/yahns/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151213021712.17776-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=yahns-public@yhbt.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).