diff --git a/ChangeLog b/ChangeLog index 0b36549dd9..54c5b0e442 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Nov 2 08:16:45 2011 Tanaka Akira + + * lib/webrick/utils.rb: fix fcntl call. + + * lib/drb/unix.rb: ditto. + Wed Nov 02 00:43:59 2011 Ayumu AIZAWA * test/psych/test_yamldbm.rb: avoid platform dependency. diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb index 549ff8cf55..6de5052451 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 983ac9f954..157c530cc9 100644 --- a/lib/webrick/utils.rb +++ b/lib/webrick/utils.rb @@ -33,7 +33,7 @@ module WEBrick # Sets the close on exec flag for +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