archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 40003: [Backport #7996]

Browse source 
* 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
This commit is contained in:
nagachika 2013-04-14 15:13:32 +00:00
parent 5b2ea4e53b
commit 5525ff192c
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Apr 15 00:13:13 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* 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 <nobu@ruby-lang.org> Mon Apr 15 00:07:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/io.h: undef POSIX compliant names on AIX, which are no * include/ruby/io.h: undef POSIX compliant names on AIX, which are no

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-04-15" #define RUBY_RELEASE_DATE "2013-04-15"
#define RUBY_PATCHLEVEL 128 #define RUBY_PATCHLEVEL 129
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4

4
win32/file.c
View file

@ -212,9 +212,9 @@ code_page(rb_encoding *enc)
names_ary = rb_funcall(encoding, names, 0); 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()) { 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)); rb_hash_aset(rb_code_page, name_key, INT2FIX(code_page));
return code_page; return code_page;
} }