1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/open-uri.rb: add :read_timeout option.

Browse Source 
[ruby-core:4848]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2005-09-15 04:56:25 +00:00
parent a2e57fd160
commit 80fb5e0584
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Sep 15 13:54:33 2005 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb: add :read_timeout option.
[ruby-core:4848]
Thu Sep 15 11:39:18 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Thu Sep 15 11:39:18 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet, * ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet,

11
lib/open-uri.rb
View File

@ -97,6 +97,7 @@ module OpenURI
:progress_proc => true, :progress_proc => true,
:content_length_proc => true, :content_length_proc => true,
:http_basic_authentication => true, :http_basic_authentication => true,
:read_timeout => true,
} }
def OpenURI.check_options(options) # :nodoc: def OpenURI.check_options(options) # :nodoc:
@ -237,6 +238,9 @@ module OpenURI
store.set_default_paths store.set_default_paths
http.cert_store = store http.cert_store = store
end end
if options.include? :read_timeout
http.read_timeout = options[:read_timeout]
end
header = {} header = {}
options.each {|k, v| header[k] = v if String === k } options.each {|k, v| header[k] = v if String === k }
@ -524,6 +528,13 @@ module OpenURI
# pbar.set s if pbar # pbar.set s if pbar
# }) {|f| ... } # }) {|f| ... }
# #
# [:read_timeout]
# Synopsis:
# :read_timeout=>nil (no timeout)
# :read_timeout=>10 (10 second)
#
# :read_timeout option specifies a timeout of read for http connections.
#
# OpenURI::OpenRead#open returns an IO like object if block is not given. # OpenURI::OpenRead#open returns an IO like object if block is not given.
# Otherwise it yields the IO object and return the value of the block. # Otherwise it yields the IO object and return the value of the block.
# The IO object is extended with OpenURI::Meta. # The IO object is extended with OpenURI::Meta.