merge revision(s) 33485:

	* lib/openssl/buffering.rb: Force multi-byte strings to be treated as
	  binary data.

	* test/openssl/test_ssl.rb: Add test for it.
	Thanks to Niklas Baumstark for reporting the issue!
	[Ruby 1.9 - Bug #5233] [ruby-core:39120]


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

1 files changed, 30 insertions, 0 deletions

diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index de7eaf9850..97e9b8fc74 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -395,6 +395,36 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
     end
   end
 
+  def test_multibyte_read_write
+    #German a umlaut
+    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|
+        sock = TCPSocket.new("127.0.0.1", port)
+        ssl = OpenSSL::SSL::SSLSocket.new(sock)
+        ssl.sync_close = true
+        ssl.connect
+        str = auml * i
+        num_written = ssl.write(str)
+        ssl.close
+      }
+    }
+  end
+
   def test_unset_OP_ALL
     ctx_proc = Proc.new { |ctx|
       ctx.options = OpenSSL::SSL::OP_ALL & ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS