From 2d302dfd40ee9a4b3183415b19dbc22cf9106ba3 Mon Sep 17 00:00:00 2001
From: kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 22 Aug 2008 11:12:06 +0000
Subject: * lib/webrick/server.rb (WEBrick::GenericServer#shutdown):   rescue
 Errno::ENOTCONN and close. [ruby-dev:35896]

* test/openssl/test_ssl.rb (OpenSSL#start_server): ditto.
  [ruby-dev:35897]

* lib/net/imap.rb (Net::IMAP#disconnect): ditto. [ruby-dev:35898]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/openssl/test_ssl.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'test/openssl/test_ssl.rb')

diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index eadff733a6..ea959892f3 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -129,7 +129,14 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
       block.call(server, port.to_i)
     ensure
       begin
-        tcps.shutdown if (tcps)
+        begin
+          tcps.shutdown
+        rescue Errno::ENOTCONN
+          # when `Errno::ENOTCONN: Socket is not connected' on some platforms,
+          # call #close instead of #shutdown.
+          tcps.close
+          tcps = nil
+        end if (tcps)
         if (server)
           server.join(5)
           if server.alive?
-- 
cgit v1.2.3