[前][次][番号順一覧][スレッド一覧]

ruby-changes:23371

From: akr <ko1@a...>
Date: Sun, 22 Apr 2012 07:53:21 +0900 (JST)
Subject: [ruby-changes:23371] akr:r35422 (trunk): * lib/drb/ssl.rb: close accepted TCP socket if SSL accept is failed.

akr	2012-04-22 07:52:23 +0900 (Sun, 22 Apr 2012)

  New Revision: 35422

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35422

  Log:
    * lib/drb/ssl.rb: close accepted TCP socket if SSL accept is failed.
      [ruby-dev:45541]

  Modified files:
    trunk/ChangeLog
    trunk/lib/drb/ssl.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35421)
+++ ChangeLog	(revision 35422)
@@ -1,3 +1,8 @@
+Sun Apr 22 07:51:29 2012  Tanaka Akira  <akr@f...>
+
+	* lib/drb/ssl.rb: close accepted TCP socket if SSL accept is failed.
+	  [ruby-dev:45541]
+
 Sat Apr 21 14:36:49 2012  Masatoshi SEKI  <m_seki@m...>
 
 	* test/rinda/test_rinda.rb: fix sticks on some tests problem
Index: lib/drb/ssl.rb
===================================================================
--- lib/drb/ssl.rb	(revision 35421)
+++ lib/drb/ssl.rb	(revision 35422)
@@ -177,7 +177,11 @@
         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]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]