From 46ad38a44da9feef468e2b282f8b6dc206642445 Mon Sep 17 00:00:00 2001 From: normal Date: Wed, 27 May 2015 00:43:02 +0000 Subject: 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 --- ChangeLog | 6 ++++++ lib/drb/drb.rb | 2 -- lib/drb/unix.rb | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72650894c2..10b6ad5857 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed May 27 09:27:30 2015 Eric Wong + + * lib/drb/drb.rb (set_sockopt): remove redundant fcntl call + * lib/drb/unix.rb (set_sockopt): ditto + [ruby-core:69128] [Feature #11137] + Tue May 26 22:10:43 2015 Shugo Maeda * vm_method.c (rb_alias): should resolve refined methods. 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 -- cgit v1.2.3