merge revision(s) 41091: [Backport #8415]

* lib/net/imap.rb (capability_response): should ignore trailing
	  spaces.  Thanks, Peter Kovacs.  [ruby-core:55024] [Bug #8415]

	* test/net/imap/test_imap_response_parser.rb: related test.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-06-08 16:35:25 +00:00
parent 6340583fa0
commit 52cdd86782
4 changed files with 20 additions and 1 deletions

View file

@ -1,3 +1,10 @@
Sun Jun 9 01:30:57 2013 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (capability_response): should ignore trailing
spaces. Thanks, Peter Kovacs. [ruby-core:55024] [Bug #8415]
* test/net/imap/test_imap_response_parser.rb: related test.
Wed Jun 5 00:38:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jun 5 00:38:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/zlib/zlib.c (gzfile_read, gzfile_read_all, gzfile_getc), * ext/zlib/zlib.c (gzfile_read, gzfile_read_all, gzfile_getc),

View file

@ -2954,6 +2954,7 @@ module Net
break break
when T_SPACE when T_SPACE
shift_token shift_token
next
end end
data.push(atom.upcase) data.push(atom.upcase)
end end

View file

@ -194,4 +194,15 @@ EOF
response.data[0].user) response.data[0].user)
assert_equal("lrswickxteda", response.data[0].rights) assert_equal("lrswickxteda", response.data[0].rights)
end end
# [Bug #8415]
def test_capability
parser = Net::IMAP::ResponseParser.new
response = parser.parse("* CAPABILITY st11p00mm-iscream009 1Q49 XAPPLEPUSHSERVICE IMAP4 IMAP4rev1 SASL-IR AUTH=ATOKEN AUTH=PLAIN\r\n")
assert_equal("CAPABILITY", response.name)
assert_equal("AUTH=PLAIN", response.data.last)
response = parser.parse("* CAPABILITY st11p00mm-iscream009 1Q49 XAPPLEPUSHSERVICE IMAP4 IMAP4rev1 SASL-IR AUTH=ATOKEN AUTH=PLAIN \r\n")
assert_equal("CAPABILITY", response.name)
assert_equal("AUTH=PLAIN", response.data.last)
end
end end

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-06-09" #define RUBY_RELEASE_DATE "2013-06-09"
#define RUBY_PATCHLEVEL 209 #define RUBY_PATCHLEVEL 210
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6