archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 04:55:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 25340:

Browse source 
* 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
This commit is contained in:
shyouhei 2009-11-24 07:14:33 +00:00
parent 1298533806
commit 06b911ea00
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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]

15
lib/net/imap.rb
View file

@ -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
version.h
View file

@ -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