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

4 files changed, 45 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a497a5551e..b96e1d97d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Feb 11 02:26:51 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* 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]
+
 Fri Feb 10 17:25:28 2012  Tanaka Akira  <akr@fsij.org>
 
 	* lib/set.rb (SortedSet.setup): remove old_init after initialize
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index eb39dabcef..51bc968e3a 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -307,6 +307,7 @@ module OpenSSL::Buffering
   def do_write(s)
     @wbuffer = "" unless defined? @wbuffer
     @wbuffer << s
+    @wbuffer.force_encoding(Encoding::BINARY)
     @sync ||= false
     if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/)
       remain = idx ? idx + $/.size : @wbuffer.length
@@ -333,7 +334,7 @@ module OpenSSL::Buffering
 
   def write(s)
     do_write(s)
-    s.length
+    s.bytesize
   end
 
   ##
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
diff --git a/version.h b/version.h
index b2eee83455..6449955b7f 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 82
+#define RUBY_PATCHLEVEL 83
 
-#define RUBY_RELEASE_DATE "2012-02-10"
+#define RUBY_RELEASE_DATE "2012-02-11"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"