nagachika	2015-11-16 03:40:58 +0900 (Mon, 16 Nov 2015)

  New Revision: 52580

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

  Log:
    merge revision(s) 50985: [Backport #11693]
    
    runruby.rb: don't close other fds
    
    * tool/runruby.rb: rubyspec now requires other FDs not to be
      closed since 7b6ce1fee.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/tool/runruby.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52579)
+++ ruby_2_2/ChangeLog	(revision 52580)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Nov 16 03:39:59 2015  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* tool/runruby.rb: rubyspec now requires other FDs not to be closed
+	  since 7b6ce1fee.
+
 Sun Nov  8 23:30:56 2015  Koichi Sasada  <ko1@a...>
 
 	* vm_trace.c (rb_threadptr_exec_event_hooks_orig):
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52579)
+++ ruby_2_2/version.h	(revision 52580)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-11-08"
-#define RUBY_PATCHLEVEL 186
+#define RUBY_RELEASE_DATE "2015-11-16"
+#define RUBY_PATCHLEVEL 187
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 16
 
 #include "ruby/version.h"
 
Index: ruby_2_2/tool/runruby.rb
===================================================================
--- ruby_2_2/tool/runruby.rb	(revision 52579)
+++ ruby_2_2/tool/runruby.rb	(revision 52580)
@@ -89,6 +89,7 @@ ENV.update env https://github.com/ruby/ruby/blob/trunk/ruby_2_2/tool/runruby.rb#L89
 cmd = [ruby]
 cmd.concat(ARGV)
 cmd.unshift(*precommand) unless precommand.empty?
+cmd.push(:close_others => false)
 
 if show
   require 'shellwords'

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50985


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