diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-24 16:21:37 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-24 16:21:37 +0000 |
commit | 38bbe3741dc592c0835b71aed1955f8b18c6e5e2 (patch) | |
tree | 9c771abfb2a46b68cd4bf4cd2cce12d7da31ef9e /lib | |
parent | bcef849df94fc48bd9c99472303f2fb7cf251f17 (diff) |
merge revision(s) 43954: [Backport #9125]
* lib/net/smtp.rb (Net::SMTP#critical): Always return a
Net::SMTP::Response. Patch by Pawel Veselov.
[ruby-trunk - Bug #9125]
* test/net/smtp/test_smtp.rb: Test for the above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/smtp.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index da8f18ff5c..11d16b1216 100644 --- a/lib/net/smtp.rb +++ b/lib/net/smtp.rb @@ -936,7 +936,7 @@ module Net end def critical - return '200 dummy reply code' if @error_occurred + return Response.parse('200 dummy reply code') if @error_occurred begin return yield() rescue Exception |