diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/webrick/utils.rb | 14 |
2 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Fri Dec 18 21:26:54 2015 Naohisa Goto <ngotogenome@gmail.com> + + * lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler): To prevent + potential deadlocks, Queue is used to tell update of @timeout_info + instead of sleep and wakeup. [Bug #11742] [ruby-dev:49387] + Fri Dec 18 17:24:09 2015 Koichi Sasada <ko1@atdot.net> * compile.c (ibf_load_object_string): use fstring if frozen string. diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb index f7b4412c19..ed0f3da615 100644 --- a/lib/webrick/utils.rb +++ b/lib/webrick/utils.rb @@ -152,6 +152,7 @@ module WEBrick TimeoutMutex.synchronize{ @timeout_info = Hash.new } + @queue = Queue.new @watcher = Thread.start{ to_interrupt = [] while true @@ -173,10 +174,14 @@ module WEBrick } to_interrupt.each {|arg| interrupt(*arg)} if !wakeup - sleep + @queue.pop elsif (wakeup -= now) > 0 - sleep(wakeup) + begin + Timeout.timeout(wakeup) { @queue.pop } + rescue Timeout::Error + end end + @queue.clear end } end @@ -200,10 +205,7 @@ module WEBrick @timeout_info[thread] ||= Array.new @timeout_info[thread] << (info = [time, exception]) } - begin - @watcher.wakeup - rescue ThreadError - end + @queue.push nil return info.object_id end |