dumping ground for random patches and texts
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 2/3] lib/drb/*.rb: avoid redundant fcntl call
Date: Mon, 11 May 2015 20:17:31 +0000	[thread overview]
Message-ID: <1431375452-6061-2-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1431375452-6061-1-git-send-email-e@80x24.org>

Sockets are close-on-exec by default since Ruby 2.0, so it
is redundant to set it again.
---
 lib/drb/drb.rb  | 2 --
 lib/drb/unix.rb | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 32e5bfb..456d0fb 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 3fb8d0e..637ea7c 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
 
-- 
EW


  reply	other threads:[~2015-05-11 20:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-11 20:17 [PATCH 1/3] lib/webrick/utils.rb: simplify by avoiding fcntl Eric Wong
2015-05-11 20:17 ` Eric Wong [this message]
2015-05-11 20:17 ` [PATCH 3/3] lib/webrick/server.rb: avoid redundant fcntl call Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431375452-6061-2-git-send-email-e@80x24.org \
    --to=e@80x24.org \
    --cc=spew@80x24.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).