1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d57dbcc744..5ff41f729b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 18 21:26:54 2015  Naohisa Goto  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* compile.c (ibf_load_object_string): use fstring if frozen string.