summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-23 18:43:05 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-23 18:43:05 +0000
commit2c2fbb8c45ca07f511e3297953c346ba6905042b (patch)
tree76b3f12b8d26e6dfa4b977767db8be79a702bdb7 /lib
parent637d08241a59b56086ef36dfd78a7961b439d82b (diff)
merge revision(s) 50444: [Backport #11128]
* lib/net/imap.rb (body_ext_mpart): should work even if body-fld-dsp is omitted. [ruby-core:69093] [Bug #11128] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/net/imap.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index a772c464ef..0517ca1385 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -2625,7 +2625,13 @@ module Net
return param
end
disposition = body_fld_dsp
- match(T_SPACE)
+
+ token = lookahead
+ if token.symbol == T_SPACE
+ shift_token
+ else
+ return param, disposition
+ end
language = body_fld_lang
token = lookahead