* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): Close a socket

  if any exception occur. 



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 15 insertions, 6 deletions

diff --git a/test/openssl/test_partial_record_read.rb b/test/openssl/test_partial_record_read.rb
index ce42131cd7..f3d83c6973 100644
--- a/test/openssl/test_partial_record_read.rb
+++ b/test/openssl/test_partial_record_read.rb
@@ -8,17 +8,26 @@ if defined?(OpenSSL)
 
       start_server(port, OpenSSL::SSL::VERIFY_NONE, true, :server_proc =>
           Proc.new do |server_ctx, server_ssl|
-            server_ssl.io.write("\x01") # the beginning of a TLS record
-            sleep 6                     # do not finish prematurely before the read by the client is attempted
+            begin
+              server_ssl.io.write("\x01") # the beginning of a TLS record
+              sleep 6                     # do not finish prematurely before the read by the client is attempted
+            ensure
+              server_ssl.close
+            end
           end
       ) do |server, port|
         sock = TCPSocket.new("127.0.0.1", port)
         ssl = OpenSSL::SSL::SSLSocket.new(sock)
-        ssl.connect
-        sleep 3  # wait is required for the (incomplete) TLS record to arrive at the client socket
+        ssl.sync_close = true
+        begin
+          ssl.connect
+          sleep 3  # wait is required for the (incomplete) TLS record to arrive at the client socket
 
-        # Should raise a IO::WaitReadable since a full TLS record is not available for reading.
-        assert_raise(IO::WaitReadable) { ssl.read_nonblock(1) }
+          # Should raise a IO::WaitReadable since a full TLS record is not available for reading.
+          assert_raise(IO::WaitReadable) { ssl.read_nonblock(1) }
+        ensure
+          ssl.close
+        end
       end
     end