archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 40015: [Backport #8196]

Browse source 
doumentation by @toolmantim [GH fixes #270]

 * timeout.rb: Document Timeout::timeout 0 and nil argument behavior



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2013-04-02 04:09:07 +00:00
parent c921d0e154
commit b6a72bcf2f
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/timeout.rb
View file

@ -33,11 +33,12 @@ module Timeout
CALLER_OFFSET = ((c = caller[0]) && THIS_FILE =~ c) ? 1 : 0
# :startdoc:
# Perform an operation in a block, timing it out if it takes longer
# than +sec+ seconds to complete.
# Perform an operation in a block, raising an error if it takes longer than
# +sec+ seconds to complete.
#
# +sec+:: Number of seconds to wait for the block to terminate. Any number
# may be used, including Floats to specify fractional seconds.
# may be used, including Floats to specify fractional seconds. A
# value of 0 or +nil+ will execute the block without any timeout.
# +klass+:: Exception Class to raise if the block fails to terminate
# in +sec+ seconds. Omitting will use the default, Timeout::Error
#

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 406
#define RUBY_PATCHLEVEL 407
#define RUBY_RELEASE_DATE "2013-04-02"
#define RUBY_RELEASE_YEAR 2013