diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-19 05:40:58 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-19 05:40:58 +0000 |
| commit | 336c45eaa23f6ff9b6861b12629f6adee682a48e (patch) | |
| tree | 782c405435f1f370346104d09caec7068080aab7 /lib | |
| parent | 0ac2587d0942d57d52df2d777caca06062454197 (diff) | |
merge revision(s) 35422:
* 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/branches/ruby_1_9_3@35713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/drb/ssl.rb | 6 |
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] |