From ea55a3fb7b99c3ed906f32583e25576918d31014 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 15 Aug 2007 19:08:39 +0000 Subject: git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ lib/net/imap.rb | 4 ++-- version.h | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b2e0e7460..771ca6685e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Aug 16 04:08:20 2007 Shugo Maeda + + * lib/net/imap.rb (ResponseParser#next_token): fixed + error message. (backported from HEAD) + + * lib/net/imap.rb (ResponseParser#parse_error): fixed + the condition not to refer @token.symbol unexpectedly. + Thanks, Dick Monahan. (backported from HEAD) + Thu Aug 16 04:05:20 2007 Yukihiro Matsumoto * marshal.c (w_extended): erroneous check condition when dump diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 4cd1d6780f..586f3fe4c0 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -3046,7 +3046,7 @@ module Net elsif $7 return Token.new(T_RPAR, $+) else - parse_error("[Net::IMAP BUG] BEG_REGEXP is invalid") + parse_error("[Net::IMAP BUG] DATA_REGEXP is invalid") end else @str.index(/\S*/n, @pos) @@ -3100,7 +3100,7 @@ module Net $stderr.printf("@str: %s\n", @str.dump) $stderr.printf("@pos: %d\n", @pos) $stderr.printf("@lex_state: %s\n", @lex_state) - if @token.symbol + if @token $stderr.printf("@token.symbol: %s\n", @token.symbol) $stderr.printf("@token.value: %s\n", @token.value.inspect) end diff --git a/version.h b/version.h index 0e4a11fc12..e155d360ed 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-16" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070816 -#define RUBY_PATCHLEVEL 54 +#define RUBY_PATCHLEVEL 55 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3