From 555eb7ded4e1fb54c434dcdd3c8348881a2a6765 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 19 Mar 2008 05:08:49 +0000 Subject: [PATCH] * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ encoding.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6b82cbef1f..ee70c2f071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 19 14:08:47 2008 Nobuyoshi Nakada + + * 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 * regint.h (include): include ruby.h instead of defines.h and config.h. diff --git a/encoding.c b/encoding.c index c7881a8eda..9759da79a4 100644 --- a/encoding.c +++ b/encoding.c @@ -108,7 +108,7 @@ enc_check_encoding(VALUE obj) if (rb_enc_from_index(index) != enc) return -1; if (enc_autoload_p(enc)) { - index = load_encoding(enc->name); + index = rb_enc_find_index(enc->name); } return index; }