diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-31 15:02:22 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-31 15:02:22 +0000 |
| commit | a3e1b1ce7ed7e7ffac23015fc2fde56511b30681 (patch) | |
| tree | 7b725552a9a4ded93849ca2faab1b257f7761790 /lib/webrick/utils.rb | |
| parent | 3e7566d8fb5138bb9cd647e5fdefc54fc9803509 (diff) | |
* Merge YARV
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/utils.rb')
| -rw-r--r-- | lib/webrick/utils.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |