nagachika	2014-06-29 01:41:52 +0900 (Sun, 29 Jun 2014)

  New Revision: 46605

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

  Log:
    merge revision(s) r46598: [Backport #9991]
    
    * lib/webrick/utils.rb (create_listeners): Close socket objects.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/webrick/utils.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46604)
+++ ruby_2_1/ChangeLog	(revision 46605)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sun Jun 29 01:34:06 2014  Tanaka Akira  <akr@f...>
+
+	* lib/webrick/utils.rb (create_listeners): Close socket objects.
+
 Sat Jun 28 16:35:51 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_substr): need to reset code range for shared
Index: ruby_2_1/lib/webrick/utils.rb
===================================================================
--- ruby_2_1/lib/webrick/utils.rb	(revision 46604)
+++ ruby_2_1/lib/webrick/utils.rb	(revision 46605)
@@ -75,7 +75,9 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/webrick/utils.rb#L75
       sockets = Socket.tcp_server_sockets(address, port)
       sockets = sockets.map {|s|
         s.autoclose = false
-        TCPServer.for_fd(s.fileno)
+        ts = TCPServer.for_fd(s.fileno)
+        s.close
+        ts
       }
       return sockets
     end
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46604)
+++ ruby_2_1/version.h	(revision 46605)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-06-28"
-#define RUBY_PATCHLEVEL 144
+#define RUBY_RELEASE_DATE "2014-06-29"
+#define RUBY_PATCHLEVEL 145
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46598


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