From 6fe1243dfe71be7aea34544a7cbdd9335168bc20 Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 23 Nov 2016 20:45:58 +0000 Subject: 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 --- ChangeLog | 6 ++++++ test/ruby/test_dir_m17n.rb | 4 +++- version.h | 6 +++--- 3 files changed, 12 insertions(+), 4 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 + + * 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 * lib/tempfile.rb (Tempfile#initialize): [DOC] the first parameter diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb index 4efc8ca34d..4e50b350da 100644 --- a/test/ruby/test_dir_m17n.rb +++ b/test/ruby/test_dir_m17n.rb @@ -376,7 +376,9 @@ class TestDir_M17N < Test::Unit::TestCase bug12081 = '[ruby-core:73868] [Bug #12081]' a = "*".force_encoding("us-ascii") result = Dir[a].map {|n| - if n.encoding == Encoding::ASCII_8BIT + if n.encoding == Encoding::ASCII_8BIT || + n.encoding == Encoding::ISO_8859_1 || + !n.valid_encoding? n.force_encoding(Encoding::UTF_8) else n.encode(Encoding::UTF_8) diff --git a/version.h b/version.h index 14d5dd5163..e689d0ed89 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.3.3" -#define RUBY_RELEASE_DATE "2016-11-21" -#define RUBY_PATCHLEVEL 222 +#define RUBY_RELEASE_DATE "2016-11-24" +#define RUBY_PATCHLEVEL 223 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 24 #include "ruby/version.h" -- cgit v1.2.3