use bytesize for binary strings. (merged from CRuby 1.9.2)

ruby/ruby@8de1ee2
MacRuby · Aug 17, 2011 · ece686b · ece686b
1 parent 83ea6c5
commit ece686b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
@@ -1237,7 +1237,7 @@ def send_quoted_string(str)
     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 @@ def format_string(str)
           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, "\\\\\\&") + '"'