naruse	2012-02-11 08:06:56 +0900 (Sat, 11 Feb 2012)

  New Revision: 34550

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

  Log:
    merge revision(s) 33508:
    
    * test/openssl/test_ssl.rb (test_multibyte_read_write): start server
      for each length to avoid race condition.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/openssl/test_ssl.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34549)
+++ ruby_1_9_3/ChangeLog	(revision 34550)
@@ -1,3 +1,8 @@
+Sat Feb 11 08:06:12 2012  Tanaka Akira  <akr@f...>
+
+	* test/openssl/test_ssl.rb (test_multibyte_read_write): start server
+	  for each length to avoid race condition.
+
 Sat Feb 11 06:13:07 2012  NARUSE, Yui  <naruse@r...>
 
 	* dir.c (fnmatch): The * needs to be escaped to avoid formatting in
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34549)
+++ ruby_1_9_3/version.h	(revision 34550)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 93
+#define RUBY_PATCHLEVEL 94
 
 #define RUBY_RELEASE_DATE "2012-02-11"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/openssl/test_ssl.rb
===================================================================
--- ruby_1_9_3/test/openssl/test_ssl.rb	(revision 34549)
+++ ruby_1_9_3/test/openssl/test_ssl.rb	(revision 34550)
@@ -400,20 +400,18 @@
     auml = [%w{ C3 A4 }.join('')].pack('H*')
     auml.force_encoding(Encoding::UTF_8)
 
-    str = nil
-    num_written = nil
-
-    server_proc = Proc.new {|ctx, ssl|
-      cmp = ssl.read
-      raw_size = cmp.size
-      cmp.force_encoding(Encoding::UTF_8)
-      assert_equal(str, cmp)
-      assert_equal(num_written, raw_size)
-      ssl.close
-    }
-
-    start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :server_proc => server_proc){|server, port|
-      [10, 1000, 100000].each {|i|
+    [10, 1000, 100000].each {|i|
+      str = nil
+      num_written = nil
+      server_proc = Proc.new {|ctx, ssl|
+        cmp = ssl.read
+        raw_size = cmp.size
+        cmp.force_encoding(Encoding::UTF_8)
+        assert_equal(str, cmp)
+        assert_equal(num_written, raw_size)
+        ssl.close
+      }
+      start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :server_proc => server_proc){|server, port|
         sock = TCPSocket.new("127.0.0.1", port)
         ssl = OpenSSL::SSL::SSLSocket.new(sock)
         ssl.sync_close = true

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