From a3e1b1ce7ed7e7ffac23015fc2fde56511b30681 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 31 Dec 2006 15:02:22 +0000
Subject: 	* Merge YARV

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/webrick/utils.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/webrick/utils.rb')

diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb
index 4a447aaf85..3b250886db 100644
--- a/lib/webrick/utils.rb
+++ b/lib/webrick/utils.rb
@@ -162,7 +162,7 @@ module WEBrick
 
     def timeout(seconds, exception=Timeout::Error)
       return yield if seconds.nil? or seconds.zero?
-      raise ThreadError, "timeout within critical session" if Thread.critical
+      # raise ThreadError, "timeout within critical session" if Thread.critical
       id = TimeoutHandler.register(seconds, exception)
       begin
         yield(seconds)
-- 
cgit v1.2.3