shyouhei	2010-06-08 16:06:46 +0900 (Tue, 08 Jun 2010)

  New Revision: 28215

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

  Log:
    merge revision(s) 27490:
    * lib/net/imap.rb (fetch_internal): do not quote message data item
      names.  Thanks, Eric Hodel.  [ruby-core:23508]  backported form
      trunk.

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

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28214)
+++ ruby_1_8_7/ChangeLog	(revision 28215)
@@ -1,3 +1,9 @@
+Tue Jun  8 16:08:00 2010  Shugo Maeda  <shugo@r...>
+
+	* lib/net/imap.rb (fetch_internal): do not quote message data item
+	  names.  Thanks, Eric Hodel.  [ruby-core:23508]  backported form
+	  trunk.
+
 Tue Jun  8 15:45:52 2010  Shugo Maeda  <shugo@r...>
 
 	* lib/net/imap (encode_utf7): encode & properly.  Thanks, Kengo
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28214)
+++ ruby_1_8_7/version.h	(revision 28215)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-08"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100608
-#define RUBY_PATCHLEVEL 279
+#define RUBY_PATCHLEVEL 280
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/net/imap.rb
===================================================================
--- ruby_1_8_7/lib/net/imap.rb	(revision 28214)
+++ ruby_1_8_7/lib/net/imap.rb	(revision 28215)
@@ -1164,9 +1164,15 @@
     end
 
     def fetch_internal(cmd, set, attr)
-      if attr.instance_of?(String)
+      case attr
+      when String then
         attr = RawData.new(attr)
+      when Array then
+        attr = attr.map { |arg|
+          arg.is_a?(String) ? RawData.new(arg) : arg
+        }
       end
+
       synchronize do
         @responses.delete("FETCH")
         send_command(cmd, MessageSet.new(set), attr)

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