* eval.c (rb_eval): should preserve value of ruby_errinfo.

* eval.c (rb_thread_schedule): inifinite sleep should not cause
  dead lock.

* array.c (rb_ary_flatten_bang): proper recursive detection.

* eval.c (yield_under): need not to prohibit at safe leve 4.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 2 deletions

diff --git a/eval.c b/eval.c
index 8fc9cfcd6d..bffb9bddcd 100644
--- a/eval.c
+++ b/eval.c
@@ -2371,9 +2371,11 @@ rb_eval(self, n)
 	POP_TAG();
 	if (node->nd_ensr) {
 	    VALUE retval = prot_tag->retval; /* save retval */
+	    VALUE errinfo = ruby_errinfo;
 
 	    rb_eval(self, node->nd_ensr);
 	    return_value(retval);
+	    ruby_errinfo = errinfo;
 	}
 	if (state) JUMP_TAG(state);
 	break;
@@ -5015,8 +5017,6 @@ static VALUE
 yield_under(under, self)
     VALUE under, self;
 {
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(self))
-	rb_raise(rb_eSecurityError, "Insecure: can't eval");
     return exec_under(yield_under_i, under, self);
 }
 
@@ -7414,6 +7414,9 @@ rb_thread_schedule()
 		delay = th_delay;
 		need_select = 1;
 	    }
+	    if (th->delay == DELAY_INFTY) {
+		need_select = 1;
+	    }
 	}
     }
     END_FOREACH_FROM(curr, th);