summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-14 06:20:41 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-14 06:20:41 +0000
commit4fe4f46592c2ba4d42a25e8559d51307b24ee0af (patch)
treede2007f330cd7868d1b7226008ff6c573eeacbb8 /ChangeLog
parent9c03800575286a49cc034ffbf92a79937187062b (diff)
merge revision(s) 50339,50340,50342,50343: [Backport #10705]
parser.rl: use StringValue * ext/json/parser/parser.rl (cParser_initialize): use StringValue instead of direct rb_convert_type and remove duplicate conversion. * ext/json/parser/parser.rl: raise with messages in UTF-8 encoding. [ruby-core:67386] [Bug #10705] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e0065ebcd..f783828d75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 14 15:09:34 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/json/parser/parser.rl: raise with messages in UTF-8
+ encoding. [ruby-core:67386] [Bug #10705]
+
Fri Aug 14 00:44:34 2015 Eric Wong <e@80x24.org>
* io.c (rb_io_oflags_modestr): handle O_TRUNC correctly