* eval.c (rb_load): allow interrupt during loaded program

  evaluation.  [ruby-dev:21834]

* hash.c (rb_hash_fetch): always warn if default argument and a
  block are supplied at the same time. [ruby-dev:21842]

* hash.c (env_fetch): ditto.

* array.c (rb_ary_fetch): ditto.


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

1 files changed, 1 insertions, 0 deletions

diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index fda18401dd..5eb7345e1b 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1295,6 +1295,7 @@ module DRb
     end
 
     def run
+      raise if Thread.critical
       Thread.start do
 	begin
 	  while true