diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-19 05:40:29 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-19 05:40:29 +0000 |
| commit | 0ac2587d0942d57d52df2d777caca06062454197 (patch) | |
| tree | 2db0d878d2a117fc616d17682e8116c23eaff2b0 /lib | |
| parent | c95748763ddd25b20a380b3ec28ad870bcf8f48b (diff) | |
merge revision(s) 33611:
* 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_9_3@35712 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/drb/unix.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/utils.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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 |