kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* encoding.c (enc_check_encoding): should not load autoloaded encoding

Browse source 
directly, instead use rb_enc_find_index() which deal with alias and
  replica.  [ruby-core:15957]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-03-19 05:08:49 +00:00
parent 149a03bdfb
commit 555eb7ded4
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Mar 19 14:08:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (enc_check_encoding): should not load autoloaded encoding
directly, instead use rb_enc_find_index() which deal with alias and
replica. [ruby-core:15957]
Wed Mar 19 11:49:47 2008 NAKAMURA Usaku <usa@ruby-lang.org> Wed Mar 19 11:49:47 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* regint.h (include): include ruby.h instead of defines.h and config.h. * regint.h (include): include ruby.h instead of defines.h and config.h.

2
encoding.c
View file

@ -108,7 +108,7 @@ enc_check_encoding(VALUE obj)
if (rb_enc_from_index(index) != enc) if (rb_enc_from_index(index) != enc)
return -1; return -1;
if (enc_autoload_p(enc)) { if (enc_autoload_p(enc)) {
index = load_encoding(enc->name); index = rb_enc_find_index(enc->name);
} }
return index; return index;
} }