start_server refined.

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

test/openssl/utils.rb

@@ -267,63 +267,59 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
 
     def start_server(port0, verify_mode, start_immediately, args = {}, &block)
       IO.pipe {|stop_pipe_r, stop_pipe_w|
+        ctx_proc = args[:ctx_proc]
+        server_proc = args[:server_proc]
+        ignore_ssl_accept_error = args.fetch(:ignore_ssl_accept_error, true)
+        server_proc ||= method(:readwrite_loop)
+
+        store = OpenSSL::X509::Store.new
+        store.add_cert(@ca_cert)
+        store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
+        ctx = OpenSSL::SSL::SSLContext.new
+        ctx.cert_store = store
+        #ctx.extra_chain_cert = [ ca_cert ]
+        ctx.cert = @svr_cert
+        ctx.key = @svr_key
+        ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 }
+        ctx.verify_mode = verify_mode
+        ctx_proc.call(ctx) if ctx_proc
+
+        Socket.do_not_reverse_lookup = true
+        tcps = nil
+        port = port0
         begin
-          ctx_proc = args[:ctx_proc]
+          tcps = TCPServer.new("127.0.0.1", port)
-          server_proc = args[:server_proc]
+        rescue Errno::EADDRINUSE
-          ignore_ssl_accept_error = args.fetch(:ignore_ssl_accept_error, true)
+          port += 1
-          server_proc ||= method(:readwrite_loop)
+          retry
-          threads = []
+        end
 
-          store = OpenSSL::X509::Store.new
+        ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
-          store.add_cert(@ca_cert)
+        ssls.start_immediately = start_immediately
-          store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
-          ctx = OpenSSL::SSL::SSLContext.new
-          ctx.cert_store = store
-          #ctx.extra_chain_cert = [ ca_cert ]
-          ctx.cert = @svr_cert
-          ctx.key = @svr_key
-          ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 }
-          ctx.verify_mode = verify_mode
-          ctx_proc.call(ctx) if ctx_proc
 
-          Socket.do_not_reverse_lookup = true
+        threads = []
-          tcps = nil
+        begin
-          port = port0
+          server = Thread.new do
-          begin
-            tcps = TCPServer.new("127.0.0.1", port)
-          rescue Errno::EADDRINUSE
-            port += 1
-            retry
-          end
-
-          ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
-          ssls.start_immediately = start_immediately
-
-          begin
-            server = Thread.new do
-              server_loop(ctx, ssls, stop_pipe_r, ignore_ssl_accept_error, server_proc, threads)
-            end
-            threads.unshift server
-
-            $stderr.printf("%s started: pid=%d port=%d\n", SSL_SERVER, $$, port) if $DEBUG
-
-            th = Thread.new do
-              begin
-                block.call(server, port.to_i)
-              ensure
-                stop_pipe_w.close
-              end
-            end
             begin
-              th.join
+              server_loop(ctx, ssls, stop_pipe_r, ignore_ssl_accept_error, server_proc, threads)
-            rescue Exception
+            ensure
-              threads.unshift th
+              tcps.close
             end
-          ensure
-            assert_join_threads(threads)
           end
+          threads.unshift server
+
+          $stderr.printf("%s started: pid=%d port=%d\n", SSL_SERVER, $$, port) if $DEBUG
+
+          client = Thread.new do
+            begin
+              block.call(server, port.to_i)
+            ensure
+              stop_pipe_w.close
+            end
+          end
+          threads.unshift client
         ensure
-          tcps.close if tcps
+          assert_join_threads(threads)
         end
       }
     end