summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-30 14:36:09 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-30 14:36:09 +0000
commitf894133daaeea0874c2032d27932ea7719efadf4 (patch)
treef4ab58447115e3b616ed82dd3dcf043de6a5e391 /ChangeLog
parentf8dab648a5eb7ba7e37020cf3eff9b99a76c242e (diff)
downloadruby-f894133daaeea0874c2032d27932ea7719efadf4.tar.gz
ruby-f894133daaeea0874c2032d27932ea7719efadf4.tar.xz
ruby-f894133daaeea0874c2032d27932ea7719efadf4.zip
merges r20056 from trunk into ruby_1_9_1.
* ruby.c (load_file_internal): should not set script encoding to ASCII-8BIT. * ruby.c (load_file_internal): do not auto convert scripts even when default_internal is set. [ruby-core:19579] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d69355f87..233c6272c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,14 @@ Thu Oct 30 09:31:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (rb_enc_set_default_internal): ditto for internal.
+Thu Oct 30 03:30:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ruby.c (load_file_internal): should not set script encoding to
+ ASCII-8BIT.
+
+ * ruby.c (load_file_internal): do not auto convert scripts even
+ when default_internal is set. [ruby-core:19579]
+
Thu Oct 30 02:20:33 2008 Yusuke Endoh <mame@tsg.ne.jp>
* array.c (rb_ary_sort_bang): remove SEGV when replacing array with
@@ -117,9 +125,6 @@ Wed Oct 29 11:01:46 2008 NAKAMURA Usaku <usa@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.
Wed Oct 29 00:43:39 2008 Tadayoshi Funaba <tadf@dotrb.org>