summaryrefslogtreecommitdiff
path: root/lib/drb
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-27 00:43:02 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-27 00:43:02 +0000
commit46ad38a44da9feef468e2b282f8b6dc206642445 (patch)
treedcba69f7f7f9dcca5d6ceb86bae9e3f10d99544b /lib/drb
parenta98f72f20cbdbc74bfde0b599e1ed098db8cf4db (diff)
drb: avoid redundant fcntl call
Sockets are close-on-exec by default since Ruby 2.0, so it is redundant to set it again. * lib/drb/drb.rb (set_sockopt): remove redundant fcntl call * lib/drb/unix.rb (set_sockopt): ditto [ruby-core:69128] [Feature #11137] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/drb')
-rw-r--r--lib/drb/drb.rb2
-rw-r--r--lib/drb/unix.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 32e5bfb9e7..456d0fbfa0 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -47,7 +47,6 @@
require 'socket'
require 'thread'
-require 'fcntl'
require 'io/wait'
require 'drb/eq'
@@ -1013,7 +1012,6 @@ module DRb
def set_sockopt(soc) # :nodoc:
soc.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
- soc.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
end
end
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index 3fb8d0ecce..637ea7cf6f 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -108,7 +108,7 @@ module DRb
end
def set_sockopt(soc)
- soc.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
+ # no-op for now
end
end