From 7e88248f7dfc639492df59bb3b251bfb4163c996 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 26 Jun 2013 07:32:55 +0000 Subject: 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_1_9_3@41647 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ lib/net/imap.rb | 1 + test/net/imap/test_imap_response_parser.rb | 11 +++++++++++ version.h | 2 +- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d939400076..8e6ec91c49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jun 26 16:31:49 2013 Shugo Maeda + + * 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 26 16:29:41 2013 Charlie Somerville * intern.h: remove dangling rb_class_init_copy declaration diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 794e82328e..df9ee8ce1e 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -2869,6 +2869,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 d1bda45d84..1547a05b2e 100644 --- a/test/net/imap/test_imap_response_parser.rb +++ b/test/net/imap/test_imap_response_parser.rb @@ -130,4 +130,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 diff --git a/version.h b/version.h index 5624c266dd..0c921e53dd 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 439 +#define RUBY_PATCHLEVEL 440 #define RUBY_RELEASE_DATE "2013-06-26" #define RUBY_RELEASE_YEAR 2013 -- cgit v1.2.3