diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | lib/net/imap.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,12 @@ +Wed Aug 22 08:27:53 2007 Shugo Maeda <shugo@ruby-lang.org> + + * 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) + Wed Aug 22 08:26:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * marshal.c (w_extended): erroneous check condition when dump diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 59df778695..6436940df6 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -3059,7 +3059,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) @@ -3113,7 +3113,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 @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-22" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070822 -#define RUBY_PATCHLEVEL 41 +#define RUBY_PATCHLEVEL 42 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |