diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/openssl/test_ssl.rb | 26 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 18 insertions, 15 deletions
@@ -1,3 +1,8 @@ +Sat Feb 11 08:06:12 2012 Tanaka Akira <akr@fsij.org> + + * 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@ruby-lang.org> * dir.c (fnmatch): The * needs to be escaped to avoid formatting in diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 97e9b8fc74..5d40a5576b 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -400,20 +400,18 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase 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 @@ -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 |