From e62fe866e562ff267b353150c39b084771c34590 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 10 Nov 2014 03:20:06 +0000 Subject: * lib/webrick/server.rb (shutdown): Use close() on @shutdown_pipe_w to notify readability on the read side of the pipe. write_nonblock() is not usable for pipe on Windows. (cleanup_shutdown_pipe): Rescue IOError for @shutdown_pipe_w.close. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/webrick/server.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/webrick') diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb index dd1be6ab23..9b83c8451d 100644 --- a/lib/webrick/server.rb +++ b/lib/webrick/server.rb @@ -226,10 +226,9 @@ module WEBrick stop shutdown_pipe_w = @shutdown_pipe_w # another thread may modify @shutdown_pipe_w. - if shutdown_pipe_w + if shutdown_pipe_w && !shutdown_pipe_w.closed? begin - shutdown_pipe_w.write_nonblock "a" - rescue IO::WaitWritable + shutdown_pipe_w.close rescue IOError # closed by another thread. end end @@ -320,7 +319,10 @@ module WEBrick def cleanup_shutdown_pipe @shutdown_pipe_r.close - @shutdown_pipe_w.close + begin + @shutdown_pipe_w.close + rescue IOError # another thread closed @shutdown_pipe_w. + end @shutdown_pipe_r = @shutdown_pipe_w = nil end -- cgit v1.2.3