yugui	2011-01-16 21:35:36 +0900 (Sun, 16 Jan 2011)

  New Revision: 30576

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

  Log:
    merges r30543 from trunk into ruby_1_9_2.
    --
    * lib/net/imap.rb: use bytesize for binary strings.
      patched by Yoshimasa Niwa. [ruby-core:34222]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/net/imap.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30575)
+++ ruby_1_9_2/ChangeLog	(revision 30576)
@@ -1,3 +1,8 @@
+Fri Jan 14 14:56:57 2011  NARUSE, Yui  <naruse@r...>
+
+	* lib/net/imap.rb: use bytesize for binary strings.
+	  patched by Yoshimasa Niwa. [ruby-core:34222]
+
 Fri Jan 14 13:38:58 2011  NARUSE, Yui  <naruse@r...>
 
 	* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in
Index: ruby_1_9_2/lib/net/imap.rb
===================================================================
--- ruby_1_9_2/lib/net/imap.rb	(revision 30575)
+++ ruby_1_9_2/lib/net/imap.rb	(revision 30576)
@@ -1237,7 +1237,7 @@
     end
 
     def send_literal(str)
-      put_string("{" + str.length.to_s + "}" + CRLF)
+      put_string("{" + str.bytesize.to_s + "}" + CRLF)
       @continuation_request_arrival.wait
       raise @exception if @exception
       put_string(str)
@@ -2571,7 +2571,7 @@
           return '""'
         when /[\x80-\xff\r\n]/n
           # literal
-          return "{" + str.length.to_s + "}" + CRLF + str
+          return "{" + str.bytesize.to_s + "}" + CRLF + str
         when /[(){ \x00-\x1f\x7f%*"\\]/n
           # quoted string
           return '"' + str.gsub(/["\\]/n, "\\\\\\&") + '"'
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30575)
+++ ruby_1_9_2/version.h	(revision 30576)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 156
+#define RUBY_PATCHLEVEL 157
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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