summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/webrick/server.rb1
2 files changed, 5 insertions, 1 deletions
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 <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