diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-24 07:14:33 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-24 07:14:33 +0000 |
commit | 06b911ea003c34a8f7d2915c935517098051f69f (patch) | |
tree | 9423b48f35b4f5ad310d4dc5f2daa32e8325c91b | |
parent | 12985338067c9e8e7744c84c88f0b327835bcafa (diff) |
merge revision(s) 25340:
* lib/net/imap.rb (resp_text_code): accepts response codes without
text. backported from trunk. [ruby-core:24194]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/net/imap.rb | 15 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 16 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Tue Nov 24 16:12:33 2009 Shugo Maeda <shugo@ruby-lang.org> + + * lib/net/imap.rb (resp_text_code): accepts response codes without + text. backported from trunk. [ruby-core:24194] + Tue Nov 24 16:09:41 2009 Shugo Maeda <shugo@ruby-lang.org> * lib/net/ftp.rb (getaddress): rescue exceptions. [ruby-dev:39451] diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 6162ffa0d0..b42b0d1dea 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -2764,11 +2764,16 @@ module Net match(T_SPACE) result = ResponseCode.new(name, number) else - match(T_SPACE) - @lex_state = EXPR_CTEXT - token = match(T_TEXT) - @lex_state = EXPR_BEG - result = ResponseCode.new(name, token.value) + token = lookahead + if token.symbol == T_SPACE + shift_token + @lex_state = EXPR_CTEXT + token = match(T_TEXT) + @lex_state = EXPR_BEG + result = ResponseCode.new(name, token.value) + else + result = ResponseCode.new(name, nil) + end end match(T_RBRA) @lex_state = EXPR_RTEXT @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-11-24" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20091124 -#define RUBY_PATCHLEVEL 218 +#define RUBY_PATCHLEVEL 219 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |