merge revision(s) r44601:

FreeBSD 10 SEGVs this less than 4M + 12K bytes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44657 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-01-19 14:51:00 +00:00
parent 8ff7f8952a
commit b809254c8c
2 changed files with 3 additions and 3 deletions

View file

@ -1001,8 +1001,8 @@ assert_equal 'ok', %q{
assert_normal_exit %q{
begin
Process.setrlimit(Process::RLIMIT_STACK, 4_202_496)
# FreeBSD fails this less than 4M + 8K bytes.
Process.setrlimit(Process::RLIMIT_STACK, 4_206_592)
# FreeBSD SEGVs this less than 4M + 12K bytes.
rescue Exception
exit
end

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-01-19"
#define RUBY_PATCHLEVEL 385
#define RUBY_PATCHLEVEL 386
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 1