diff options
author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-17 05:59:08 +0000 |
---|---|---|
committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-17 05:59:08 +0000 |
commit | ce34a90fb52ed3bd381c849794dce211d4b4ff69 (patch) | |
tree | 15d8b81cf68f2987685cea89a21f3be3eacf1deb | |
parent | 8ff35b816ae3b44a6f1ee8e8c07e0ab833510b94 (diff) | |
download | ruby-ce34a90fb52ed3bd381c849794dce211d4b4ff69.tar.gz |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/webrick/server.rb | 1 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun May 17 14:57:42 2015 Eric Wong <e@80x24.org> + + * lib/webrick/server.rb (accept_client): avoid redundant fcntl call + [Feature #11137] + Sun May 17 12:13:33 2015 Eric Wong <e@80x24.org> * 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 |