From 4fd53e476e493630a140edc085c71f2670d74942 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 13 Dec 2013 16:11:12 +0000
Subject: * ext/socket/lib/socket.rb: Don't test $! in "ensure" clause because 
  it may be set before the body.   Reported by ko1 and mrkn. 
 [ruby-core:59088] [Bug #9247]

* lib/cgi/core.rb: Ditto.

* lib/drb/ssl.rb: Ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/drb/ssl.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/drb')

diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index 82a9c7ce90..78c0038abc 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -328,8 +328,9 @@ module DRb
       end
       begin
 	ssl = @config.accept(soc)
-      ensure
-        soc.close if $!
+      rescue Exception
+        soc.close
+        raise
       end
       self.class.new(uri, ssl, @config, true)
       rescue OpenSSL::SSL::SSLError
-- 
cgit v1.2.3