From ce34a90fb52ed3bd381c849794dce211d4b4ff69 Mon Sep 17 00:00:00 2001 From: normal Date: Sun, 17 May 2015 05:59:08 +0000 Subject: [PATCH] lib/webrick/server.rb: avoid redundant fcntl call Sockets are close-on-exec by default since Ruby 2.0, so it is redundant to set it again. * lib/webrick/server.rb (accept_client): avoid redundant fcntl call [Feature #11137] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/webrick/server.rb | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 83be18896b..ce210d4062 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun May 17 14:57:42 2015 Eric Wong + + * lib/webrick/server.rb (accept_client): avoid redundant fcntl call + [Feature #11137] + Sun May 17 12:13:33 2015 Eric Wong * ext/socket/init.c (cloexec_accept): support nonblock flag and diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb index 815375f30f..5ada88ac73 100644 --- a/lib/webrick/server.rb +++ b/lib/webrick/server.rb @@ -263,7 +263,6 @@ module WEBrick sock = svr.accept sock.sync = true Utils::set_non_blocking(sock) - Utils::set_close_on_exec(sock) rescue Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINVAL rescue StandardError => ex