From 5525ff192c620e46d2364a10e78ece9ee64d7d7a Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 14 Apr 2013 15:13:32 +0000 Subject: [PATCH] merge revision(s) 40003: [Backport #7996] * win32/file.c (code_page): use cp1252 instead of cp20127 as US-ASCII. fix [ruby-core:53079] [Bug #7996] reported and patched by mmeltner (Michael Meltner). reported by mitchellh (Mitchell Hashimoto). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ version.h | 2 +- win32/file.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 57b35d75d6..eaa5d11a7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Apr 15 00:13:13 2013 NAKAMURA Usaku + + * win32/file.c (code_page): use cp1252 instead of cp20127 as US-ASCII. + fix [ruby-core:53079] [Bug #7996] + reported and patched by mmeltner (Michael Meltner). + Mon Apr 15 00:07:31 2013 Nobuyoshi Nakada * include/ruby/io.h: undef POSIX compliant names on AIX, which are no diff --git a/version.h b/version.h index fe6d111ce6..85d00bd7e6 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-04-15" -#define RUBY_PATCHLEVEL 128 +#define RUBY_PATCHLEVEL 129 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 4 diff --git a/win32/file.c b/win32/file.c index 350f8da182..96fe61bad2 100644 --- a/win32/file.c +++ b/win32/file.c @@ -212,9 +212,9 @@ code_page(rb_encoding *enc) names_ary = rb_funcall(encoding, names, 0); } - /* map US-ASCII and ASCII-8bit as code page 20127 (us-ascii) */ + /* map US-ASCII and ASCII-8bit as code page 1252 (us-ascii) */ if (enc == rb_usascii_encoding() || enc == rb_ascii8bit_encoding()) { - UINT code_page = 20127; + UINT code_page = 1252; rb_hash_aset(rb_code_page, name_key, INT2FIX(code_page)); return code_page; }