From 2dbae9b1f14d43f774153a7474dba9c6134dc5b4 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 7 May 2014 12:48:27 +0000
Subject: * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#accept):  
 Consider Socket#accept as well as TCPServer#accept.   Reported by Sam
 Stelfox.  [ruby-core:62064] [Bug #9750]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/openssl/lib/openssl/ssl.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'ext/openssl')

diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 0600080adc..bb5db9b5d3 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -225,7 +225,10 @@ module OpenSSL
 
       # Works similar to TCPServer#accept.
       def accept
-        sock = @svr.accept
+        # Socket#accept returns [socket, addrinfo].
+        # TCPServer#accept returns a socket.
+        # The following comma strips addrinfo.
+        sock, = @svr.accept
         begin
           ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
           ssl.sync_close = true
-- 
cgit v1.2.3