mame	2008-07-27 23:33:05 +0900 (Sun, 27 Jul 2008)

  New Revision: 18234

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18234

  Log:
    * test/openssl/test_ssl.rb (server_loop): rescue Errno::EINVAL and
      Errno::ECONNABORTED.

  Modified files:
    trunk/ChangeLog
    trunk/test/openssl/test_ssl.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18233)
+++ ChangeLog	(revision 18234)
@@ -1,3 +1,8 @@
+Sun Jul 27 23:32:42 2008  Yusuke Endoh  <mame@t...>
+
+	* test/openssl/test_ssl.rb (server_loop): rescue Errno::EINVAL and
+	  Errno::ECONNABORTED.
+
 Sun Jul 27 22:11:57 2008  NARUSE, Yui  <naruse@r...>
 
 	* bootstraptests/method.rb: increase RLIMIT_STACK size to 4M+8Kbytes
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 18233)
+++ test/openssl/test_ssl.rb	(revision 18234)
@@ -86,7 +86,7 @@
         server_proc.call(ctx, ssl)
       end
     end
-  rescue Errno::EBADF, IOError
+  rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED
   end
 
   def start_server(port0, verify_mode, start_immediately, args = {}, &block)
@@ -128,8 +128,8 @@
 
       block.call(server, port.to_i)
     ensure
-      tcps.shutdown if (tcps)
       begin
+        tcps.shutdown if (tcps)
         if (server)
           server.join(5)
           if server.alive?
@@ -138,7 +138,6 @@
             flunk("TCPServer was closed and SSLServer is still alive") unless $!
           end
         end
-      rescue Errno::EINVAL, Errno::EBADF
       ensure
         tcps.close if (tcps)
       end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/