diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-29 10:32:19 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-29 10:32:19 +0000 |
commit | 68ac33a511929268ff5b0e05601b855a3a031b31 (patch) | |
tree | 561b4ea925c0554b2b428804a5a9f56e0f94cd8f /ext | |
parent | c65ef1539bf765a2a8185b51e0ca4ee98a42c517 (diff) | |
download | ruby-68ac33a511929268ff5b0e05601b855a3a031b31.tar.gz |
* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): Close a socket
if any exception occur.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/openssl/lib/openssl/ssl.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb index bb5db9b5d3..fb1045381f 100644 --- a/ext/openssl/lib/openssl/ssl.rb +++ b/ext/openssl/lib/openssl/ssl.rb @@ -234,8 +234,12 @@ module OpenSSL ssl.sync_close = true ssl.accept if @start_immediately ssl - rescue SSLError => ex - sock.close + rescue Exception => ex + if ssl + ssl.close + else + sock.close + end raise ex end end |