summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-23 20:45:58 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-23 20:45:58 +0000
commit6fe1243dfe71be7aea34544a7cbdd9335168bc20 (patch)
treeb9a27b18d8c44f83fdc7052b325a25aa6baf6cc1 /ChangeLog
parentf82fd950c1a86235eb0529641f482b5a7e4ba835 (diff)
merge revision(s) 56881: [Backport #12972]
Don't encode to UTF-8 if it's unnecessary. If the file system encoding is ISO-8851-1 or if the encoding of the target string is invalid, don't encode to UTF-8. [ruby-core:78271] [Bug#12972] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56887 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 2982c96e13..fe4769b9af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 24 05:44:04 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+
+ * test/ruby/test_dir_m17n.rb: Don't encode to UTF-8 if it's unnecessary.
+ If the file system encoding is ISO-8851-1 or if the encoding of the
+ target string is invalid, don't encode to UTF-8. [Bug#12972]
+
Mon Nov 21 16:55:15 2016 boshan <boshan@subsplash.com>
* lib/tempfile.rb (Tempfile#initialize): [DOC] the first parameter