summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-18 11:48:11 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-18 11:48:11 +0000
commit5d428a7e52ecad84e9be438871ca039fb6ccea11 (patch)
tree68a36dbd57cc508ed1cd7f3e87ea36deea6307af
parentdacb9169c3fc92a6827ab8d1a16e34c341612f48 (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52644 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-xtool/runruby.rb1
-rw-r--r--version.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/tool/runruby.rb b/tool/runruby.rb
index 86b9327350..80ad66a497 100755
--- a/tool/runruby.rb
+++ b/tool/runruby.rb
@@ -89,6 +89,7 @@ ENV.update env
cmd = [ruby]
cmd.concat(ARGV)
cmd.unshift(*precommand) unless precommand.empty?
+cmd.push(:close_others => false)
if show
require 'shellwords'
diff --git a/version.h b/version.h
index 5486c37738..c88c5863ba 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.8"
#define RUBY_RELEASE_DATE "2015-11-18"
-#define RUBY_PATCHLEVEL 419
+#define RUBY_PATCHLEVEL 420
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 11