summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-21 14:06:21 +0000
committerseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-21 14:06:21 +0000
commit3862a46d53b8bfcfaaf17c1614ea248f30e368ff (patch)
tree44f5b7e4ec6424085d78714be6aa6eccc86a8cc5
parentd431d5adadb93469f90bc56ff567b872b9a4e3be (diff)
downloadruby-3862a46d53b8bfcfaaf17c1614ea248f30e368ff.tar.gz
ruby-3862a46d53b8bfcfaaf17c1614ea248f30e368ff.tar.xz
ruby-3862a46d53b8bfcfaaf17c1614ea248f30e368ff.zip
remove O_NONBLOCK
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5527 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/drb/drb.rb1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 56ee3f899..2398ea428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 21 23:03:45 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
+ * lib/drb/extserv.rb: typo
+
Wed Jan 21 17:57:56 2004 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (envelope): allow NIL.
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index e9ac40773..80beb0244 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -903,7 +903,6 @@ 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_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
end
end