diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/net/protocol.rb | 9 | ||||
-rw-r--r-- | lib/net/smtp.rb | 1 |
3 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Thu Oct 26 02:42:50 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp> + + * lib/net/protocol.rb: Command#critical_ok + + * lib/net/smtp.rb: clear critical flag before go to SMTP + Wed Oct 25 12:30:19 2000 Yukihiro Matsumoto <matz@ruby-lang.org> * array.c (rb_ary_concat): replacing array might be the receiver diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index 237c4a116a..8aca2ef2d6 100644 --- a/lib/net/protocol.rb +++ b/lib/net/protocol.rb @@ -402,9 +402,9 @@ module Net def critical return if @critical @critical = true - r = yield + ret = yield @critical = false - r + ret end def critical? @@ -421,6 +421,11 @@ module Net @critical = false end + def critical_ok + @critical = false + end + public :critical_ok + end diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index 4ea9a2f221..33fc41e42a 100644 --- a/lib/net/smtp.rb +++ b/lib/net/smtp.rb @@ -146,6 +146,7 @@ module Net rescue ProtocolError if @esmtp then @esmtp = false + @command.critical_ok retry else raise |