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 | 4ef881bd15c9c4e2e9b20da2c091e80d4d530119 (patch) | |
| tree | 7b725552a9a4ded93849ca2faab1b257f7761790 /lib/webrick | |
| parent | 182520b0acc5eea4da52bc8734dc5e3280ce5f94 (diff) | |
| download | ruby-4ef881bd15c9c4e2e9b20da2c091e80d4d530119.tar.gz ruby-4ef881bd15c9c4e2e9b20da2c091e80d4d530119.tar.xz ruby-4ef881bd15c9c4e2e9b20da2c091e80d4d530119.zip | |
* Merge YARV
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick')
| -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 4a447aaf8..3b250886d 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) |