mirror of
https://github.com/ruby/ruby.git
synced 2025-09-17 17:43:59 +02:00
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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
69da79fafc
commit
96de351eed
4 changed files with 23 additions and 4 deletions
|
@ -1740,7 +1740,7 @@ module Net
|
|||
# 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
|
|||
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
|
|||
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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue