summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-10 03:36:25 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-10 03:36:25 +0000
commit9d742d7365cfde9317b8acf5c24c0b22bc916f9b (patch)
treeae31f61cc89de5ef91f5d3649ffd5748858aa720 /ChangeLog
parent07b140ecb19dfefb0eef7eb12c5ecbe8d11acb5b (diff)
merge revision(s) 47288: [Backport #10153]
* io.c (io_close): ignore only "closed stream" IOError and NoMethodError, do not swallow other exceptions at the end of block. [ruby-core:64463] [Bug #10153] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47503 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 5dc537ceb9..d4003d5243 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 10 12:34:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (io_close): ignore only "closed stream" IOError and
+ NoMethodError, do not swallow other exceptions at the end of
+ block. [ruby-core:64463] [Bug #10153]
+
Wed Sep 10 12:27:08 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enc/trans/euckr-tbl.rb (EUCKR_TO_UCS_TBL): add missing euro and