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

ruby-changes:23662

From: naruse <ko1@a...>
Date: Sat, 19 May 2012 14:41:07 +0900 (JST)
Subject: [ruby-changes:23662] naruse:r35713 (ruby_1_9_3): merge revision(s) 35422:

naruse	2012-05-19 14:40:58 +0900 (Sat, 19 May 2012)

  New Revision: 35713

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

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

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/drb/ssl.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35712)
+++ ruby_1_9_3/ChangeLog	(revision 35713)
@@ -1,3 +1,8 @@
+Sat May 19 14:40:49 2012  Tanaka Akira  <akr@f...>
+
+	* lib/drb/ssl.rb: close accepted TCP socket if SSL accept is failed.
+	  [ruby-dev:45541]
+
 Sat May 19 14:39:50 2012  Tanaka Akira  <akr@f...>
 
 	* lib/webrick/utils.rb: fix fcntl call.
Index: ruby_1_9_3/lib/drb/ssl.rb
===================================================================
--- ruby_1_9_3/lib/drb/ssl.rb	(revision 35712)
+++ ruby_1_9_3/lib/drb/ssl.rb	(revision 35713)
@@ -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]
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35712)
+++ ruby_1_9_3/version.h	(revision 35713)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 218
+#define RUBY_PATCHLEVEL 219
 
 #define RUBY_RELEASE_DATE "2012-05-19"
 #define RUBY_RELEASE_YEAR 2012

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

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