diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Jul 15 23:50:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (rb_require_safe): wait for another thread requiring the same + feature. fixed: [ruby-core:08229] + Sat Jul 15 01:27:13 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * dir.c (has_magic): glob names contain alphabets to enable case fold @@ -7137,12 +7137,11 @@ rb_require_safe(fname, safe) ruby_safe_level = safe; found = search_required(fname, &feature, &path); if (found) { - if (!path || load_wait(RSTRING(path)->ptr)) { + if (!path || load_wait(RSTRING(feature)->ptr)) { result = Qfalse; } else { ruby_safe_level = 0; - rb_provide_feature(feature); switch (found) { case 'r': /* loading ruby library should be serialized. */ @@ -7165,6 +7164,7 @@ rb_require_safe(fname, safe) rb_ary_push(ruby_dln_librefs, LONG2NUM(handle)); break; } + rb_provide_feature(feature); result = Qtrue; } } |