summaryrefslogtreecommitdiff
path: root/lib/drb/ssl.rb
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-21 22:52:23 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-21 22:52:23 +0000
commitcc19bcf11fdb008e74efdffab78b6680d2728385 (patch)
treeaac73c1b9916f4855bff3d83948a96eff45a6ab5 /lib/drb/ssl.rb
parent5849614d026501d810d45c25926c719313fe82e9 (diff)
* lib/drb/ssl.rb: close accepted TCP socket if SSL accept is failed.
[ruby-dev:45541] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35422 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/drb/ssl.rb')
-rw-r--r--lib/drb/ssl.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index 17e2a73d85..ebd648b256 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -177,7 +177,11 @@ module DRb
break if (@acl ? @acl.allow_socket?(soc) : true)
soc.close
end
- ssl = @config.accept(soc)
+ begin
+ ssl = @config.accept(soc)
+ ensure
+ soc.close if $!
+ end
self.class.new(uri, ssl, @config, true)
rescue OpenSSL::SSL::SSLError
warn("#{__FILE__}:#{__LINE__}: warning: #{$!.message} (#{$!.class})") if @config[:verbose]