kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

drb: avoid redundant fcntl call

Browse source 
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
This commit is contained in:
normal 2015-05-27 00:43:02 +00:00
parent a98f72f20c
commit 46ad38a44d
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed May 27 09:27:30 2015 Eric Wong <e@80x24.org>
* 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 <shugo@ruby-lang.org>
* vm_method.c (rb_alias): should resolve refined methods.

2
lib/drb/drb.rb
View file

@ -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

2
lib/drb/unix.rb
View file

@ -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