aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-15 16:03:00 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-15 16:03:00 +0000
commite337dc65173f11b2be9e620acb34dc91a64fe520 (patch)
tree16bf47c07525bc661ded5b861b5525761dccbdea /ChangeLog
parent00f9a74bcac20e25b69aae3a3beafddb18293abd (diff)
downloadruby-e337dc65173f11b2be9e620acb34dc91a64fe520.tar.gz
* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler): Acquire
TimeoutMutex only when accessing @timeout_info for avoiding potential deadlock. [Bug #11742] [ruby-dev:49387] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index eabfe4646d..ab7d04e8cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 16 00:53:45 2015 Naohisa Goto <ngotogenome@gmail.com>
+
+ * lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler): Acquire
+ TimeoutMutex only when accessing @timeout_info for avoiding
+ potential deadlock. [Bug #11742] [ruby-dev:49387]
+
Wed Dec 16 00:39:27 2015 Jake Worth <jakeworth82@gmail.com>
* doc/extension.rdoc: [DOC] fix double-word typo. [Fix GH-1153]