From 38bbe3741dc592c0835b71aed1955f8b18c6e5e2 Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 24 Dec 2013 16:21:37 +0000 Subject: 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 --- lib/net/smtp.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') 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 -- cgit v1.2.3