diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-01 23:17:53 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-01 23:17:53 +0000 |
commit | cd53a65274f31220e0d057268421e859c09051d6 (patch) | |
tree | fb61107959a0d37575260da44a8d9ce974059e8a | |
parent | c1ad87aae10000d827ec5bf3041fb2d278362fb2 (diff) |
* lib/webrick/utils.rb: fix fcntl call.
* lib/drb/unix.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@33611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/drb/unix.rb | 2 | ||||
-rw-r--r-- | lib/webrick/utils.rb | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed Nov 2 08:16:45 2011 Tanaka Akira <akr@fsij.org> + + * lib/webrick/utils.rb: fix fcntl call. + + * lib/drb/unix.rb: ditto. + Sun Oct 30 00:48:57 2011 Akinori MUSHA <knu@iDaemons.org> * configure.in (CXX): Set CXX when mkconfig.rb wants it defined. diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb index ebecc22901..e56008c998 100644 --- a/lib/drb/unix.rb +++ b/lib/drb/unix.rb @@ -100,7 +100,7 @@ module DRb 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/webrick/utils.rb b/lib/webrick/utils.rb index 823a329fbd..e567aba0c1 100644 --- a/lib/webrick/utils.rb +++ b/lib/webrick/utils.rb @@ -29,7 +29,7 @@ module WEBrick 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 |