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_1_9_3@44741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index f6e2ea9d9c..ca6b70669b 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -934,11 +934,11 @@ module Net
     end
 
     def critical(&block)
-      return '200 dummy reply code' if @error_occured
+      return Response.parse('200 dummy reply code') if @error_occurred
       begin
         return yield()
       rescue Exception
-        @error_occured = true
+        @error_occurred = true
         raise
       end
     end