diff --git a/default.build.properties b/default.build.properties index 37e2cd126a0..8689de78ae0 100644 --- a/default.build.properties +++ b/default.build.properties @@ -73,7 +73,7 @@ install4j.executable=/Applications/install4j 4/bin/install4jc version.ruby=1.8.7 version.ruby.major=1.8 version.ruby.minor=7 -version.ruby.patchlevel=357 +version.ruby.patchlevel=370 version.ruby1_9.major=1.9 version.ruby1_9=1.9.3 diff --git a/lib/ruby/1.8/drb/unix.rb b/lib/ruby/1.8/drb/unix.rb index 57feed8301a..90ca292b7a5 100644 --- a/lib/ruby/1.8/drb/unix.rb +++ b/lib/ruby/1.8/drb/unix.rb @@ -100,7 +100,7 @@ def accept end def set_sockopt(soc) - soc.fcntl(Fcntl::F_SETFL, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC + soc.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC end end diff --git a/lib/ruby/1.8/webrick/utils.rb b/lib/ruby/1.8/webrick/utils.rb index cf9da6f2cea..1c29ef5ed0d 100644 --- a/lib/ruby/1.8/webrick/utils.rb +++ b/lib/ruby/1.8/webrick/utils.rb @@ -29,7 +29,7 @@ def set_non_blocking(io) def set_close_on_exec(io) if defined?(Fcntl::FD_CLOEXEC) - io.fcntl(Fcntl::FD_CLOEXEC, 1) + io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) end end module_function :set_close_on_exec