diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-08 16:35:25 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-08 16:35:25 +0000 |
commit | 52cdd8678285aa0786d013b968dc66f1aa558921 (patch) | |
tree | ac59057a07d3e73ee3432670cb1dff4f2ae92cf3 | |
parent | 6340583fa0ca1679b75ee0d207f8d15e1f7facba (diff) |
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
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | lib/net/imap.rb | 1 | ||||
-rw-r--r-- | test/net/imap/test_imap_response_parser.rb | 11 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 20 insertions, 1 deletions
@@ -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> * ext/zlib/zlib.c (gzfile_read, gzfile_read_all, gzfile_getc), diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 50548f138f..0ae47c5316 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -2954,6 +2954,7 @@ module Net break when T_SPACE shift_token + next end data.push(atom.upcase) end diff --git a/test/net/imap/test_imap_response_parser.rb b/test/net/imap/test_imap_response_parser.rb index ee27a1271e..28a80fdd49 100644 --- a/test/net/imap/test_imap_response_parser.rb +++ b/test/net/imap/test_imap_response_parser.rb @@ -194,4 +194,15 @@ EOF response.data[0].user) assert_equal("lrswickxteda", response.data[0].rights) 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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-06-09" -#define RUBY_PATCHLEVEL 209 +#define RUBY_PATCHLEVEL 210 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 |