aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-29 00:30:09 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-29 00:30:09 +0000
commitbc4bc3a80fb1dcb477b29ec059d81670d101c975 (patch)
tree2c18f162b690ad773cb5d5f47a14c43ec931486b
parentbd92ab89c0d368da3a5cb449431f64ccb92e8279 (diff)
downloadruby-bc4bc3a80fb1dcb477b29ec059d81670d101c975.tar.gz
* ruby.c (load_file_internal): use ASCII-8BIT to prevent conversion.
[ruby-core:19579] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ruby.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b327b5660b..4e83053698 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Wed Oct 29 09:23:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 29 09:30:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (load_file_internal): use ASCII-8BIT to prevent conversion.
+ [ruby-core:19579]
* ruby.c (load_file_internal): cache common interned IDs.
diff --git a/ruby.c b/ruby.c
index 556944ff81..7bbc5b0139 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1255,7 +1255,7 @@ load_file_internal(VALUE arg)
int no_ext_enc = !opt->ext.enc.name;
int no_int_enc = !opt->intern.enc.name;
- enc = rb_usascii_encoding();
+ enc = rb_ascii8bit_encoding();
rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc));
if (opt->xflag) {
@@ -1356,7 +1356,7 @@ load_file_internal(VALUE arg)
enc = rb_locale_encoding();
}
else {
- enc = rb_usascii_encoding();
+ enc = rb_ascii8bit_encoding();
}
rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc));
tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start);