diff --git a/ChangeLog b/ChangeLog index 51ec6b4eae..0e58e99b92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Dec 12 17:26:51 2011 Nobuyoshi Nakada + + * load.c (rb_feature_p): lazy assigned load_path searched in + loading_table were not expanded, but all features, pushed to + loading table, are expanded. a patch by Yura Sokolov + in [ruby-core:41545]. [Bug #5727] + Mon Dec 12 15:41:03 2011 Nobuyoshi Nakada * ext/stringio/stringio.c (strio_truncate): fix typo. patched by diff --git a/load.c b/load.c index 9ed386d6c9..9f09dd548d 100644 --- a/load.c +++ b/load.c @@ -183,7 +183,7 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c fs.name = feature; fs.len = len; fs.type = type; - fs.load_path = load_path ? load_path : rb_get_load_path(); + fs.load_path = load_path ? load_path : rb_get_expanded_load_path(); fs.result = 0; st_foreach(loading_tbl, loaded_feature_path_i, (st_data_t)&fs); if ((f = fs.result) != 0) {