summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-03 10:40:27 +0000
committerseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-03 10:40:27 +0000
commit3d9ba0390c467353d2117d4dd990dcf3f6bea717 (patch)
tree0285cab91adc05ac0daffb9169ff707d8192ab1c
parent2f4c13b0f070689e10f965c3ecc386381e092866 (diff)
correct fcntl parameer
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/drb/drb.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bd5546e2fd..fca180cb57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 3 19:38:36 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/drb.rb: correct fcntl parameter. [ruby-dev:22120]
+
Wed Dec 3 13:49:07 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: 'format'==>'Kernel.format' (avoid override trouble)
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index fb083b0c4d..00d5fa1d23 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -900,7 +900,7 @@ module DRb
def set_sockopt(soc) # :nodoc:
soc.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
soc.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK) if defined? Fcntl::O_NONBLOCK
- 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