aboutsummaryrefslogtreecommitdiffstats
path: root/test/webrick
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-30 12:32:48 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-30 12:32:48 +0000
commit6f226d9d42676860cdabc1e1c85cb9e9202e8ddd (patch)
treedb29b1c3bfacf7422add9224bd03c715275ac0e8 /test/webrick
parent99e389a6a7e098720188f6f660fb843351ffca39 (diff)
downloadruby-6f226d9d42676860cdabc1e1c85cb9e9202e8ddd.tar.gz
* lib/webrick/server.rb: Use a pipe to detect server shutdown.
shutdown() or close() for listening socket is not a reliable. Actually, both doesn't work (doesn't wake up select()) on DragonFly BSD 3.6.2. * test/webrick/utils.rb: :ShutdownSocketWithoutClose is not required now to immediate server shutdown detection. This fixes fd leaks. * test/net/http/utils.rb: Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/webrick')
-rw-r--r--test/webrick/utils.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/webrick/utils.rb b/test/webrick/utils.rb
index 10bd7a995b..f1b24ccdd6 100644
--- a/test/webrick/utils.rb
+++ b/test/webrick/utils.rb
@@ -37,7 +37,6 @@ module TestWEBrick
log = proc { "webrick log start:\n" + log_string.gsub(/^/, " ").chomp + "\nwebrick log end" }
server = klass.new({
:BindAddress => "127.0.0.1", :Port => 0,
- :ShutdownSocketWithoutClose =>true,
:ServerType => Thread,
:Logger => WEBrick::Log.new(logger),
:AccessLog => [[logger, ""]]