diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-21 05:12:20 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-21 05:12:20 +0000 |
| commit | 7944b62832cf666282fd605089c4bc170387cee3 (patch) | |
| tree | 4cbfcc805eee0af8a262bdab56cc1db21a13f192 /lib | |
| parent | a2126a678c1b2b3f972872778f267c9461ffc771 (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_1@50583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/imap.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 1bb0b81eec..a8845c1314 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -2582,7 +2582,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 |