diff options
| author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-10-25 17:40:30 +0000 |
|---|---|---|
| committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-10-25 17:40:30 +0000 |
| commit | 34f44ca496108c98d05cf2338e36fa66bc362255 (patch) | |
| tree | 8dc640c0f56ecd242e1d086a25b54255b1c7606b | |
| parent | 033a4ffa4b2fc59017995f8a2856dbc73af87c82 (diff) | |
aamine
* lib/net/protocol.rb: Command#critical_ok
* lib/net/smtp.rb: clear critical flag before go to SMTP
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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 |