nagachika	2013-04-23 22:51:36 +0900 (Tue, 23 Apr 2013)

  New Revision: 40426

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

  Log:
    merge revision(s) 40419: [Backport #8281]
    
    * lib/net/imap.rb (getacl_response): parse the mailbox of an ACL
      response correctly.  [ruby-core:54365] [Bug #8281]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/net/imap.rb
    branches/ruby_2_0_0/test/net/imap/test_imap_response_parser.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40425)
+++ ruby_2_0_0/ChangeLog	(revision 40426)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Apr 23 22:33:16 2013  Shugo Maeda  <shugo@r...>
+
+	* lib/net/imap.rb (getacl_response): parse the mailbox of an ACL
+	  response correctly.  [ruby-core:54365] [Bug #8281]
+
 Sun Apr 21 00:14:36 2013  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
Index: ruby_2_0_0/lib/net/imap.rb
===================================================================
--- ruby_2_0_0/lib/net/imap.rb	(revision 40425)
+++ ruby_2_0_0/lib/net/imap.rb	(revision 40426)
@@ -1740,7 +1740,7 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/imap.rb#L1740
     # rights:: The access rights the indicated user has to the
     #          mailbox.
     #
-    MailboxACLItem = Struct.new(:user, :rights)
+    MailboxACLItem = Struct.new(:user, :rights, :mailbox)
 
     # Net::IMAP::StatusData represents contents of the STATUS response.
     #
@@ -2807,6 +2807,7 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/imap.rb#L2807
         token = match(T_ATOM)
         name = token.value.upcase
         match(T_SPACE)
+        mailbox = astring
         data = []
         token = lookahead
         if token.symbol == T_SPACE
@@ -2822,8 +2823,7 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/imap.rb#L2823
             user = astring
             match(T_SPACE)
             rights = astring
-            ##XXX data.push([user, rights])
-            data.push(MailboxACLItem.new(user, rights))
+            data.push(MailboxACLItem.new(user, rights, mailbox))
           end
         end
         return UntaggedResponse.new(name, data, @str)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40425)
+++ ruby_2_0_0/version.h	(revision 40426)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-23"
-#define RUBY_PATCHLEVEL 161
+#define RUBY_PATCHLEVEL 162
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_0_0/test/net/imap/test_imap_response_parser.rb
===================================================================
--- ruby_2_0_0/test/net/imap/test_imap_response_parser.rb	(revision 40425)
+++ ruby_2_0_0/test/net/imap/test_imap_response_parser.rb	(revision 40426)
@@ -180,4 +180,18 @@ EOF https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/net/imap/test_imap_response_parser.rb#L180
 * 1038 FETCH (BODY ("MIXED"))
 EOF
   end
+
+  # [Bug #8281]
+  def test_acl
+    parser = Net::IMAP::ResponseParser.new
+    response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
+* ACL "INBOX/share" "imshare2copy1366146467@x..." lrswickxteda
+EOF
+    assert_equal("ACL", response.name)
+    assert_equal(1, response.data.length)
+    assert_equal("INBOX/share", response.data[0].mailbox)
+    assert_equal("imshare2copy1366146467@x...",
+                 response.data[0].user)
+    assert_equal("lrswickxteda", response.data[0].rights)
+  end
 end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40419


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