# the partial text at each chunk. Return the partial body.
def partial_body(size=0, &block)
- self.no_cache = true
partial = String.new
- self.read_body { |chunk|
- partial << chunk
+ if @read
+ debug "using body() as partial"
+ partial = self.body
yield self.body_to_utf(self.decompress_body(partial)) if block_given?
- break if size and size > 0 and partial.length >= size
- }
+ else
+ debug "disabling cache"
+ self.no_cache = true
+ self.read_body { |chunk|
+ partial << chunk
+ yield self.body_to_utf(self.decompress_body(partial)) if block_given?
+ break if size and size > 0 and partial.length >= size
+ }
+ end
return self.body_to_utf(self.decompress_body(partial))
end
# this class can check the bot proxy configuration to determine if a proxy
# needs to be used, which includes support for per-url proxy configuration.
class HttpUtil
+ Bot::Config.register Bot::Config::IntegerValue.new('http.read_timeout',
+ :default => 10, :desc => "Default read timeout for HTTP connections")
+ Bot::Config.register Bot::Config::IntegerValue.new('http.open_timeout',
+ :default => 20, :desc => "Default open timeout for HTTP connections")
Bot::Config.register Bot::Config::BooleanValue.new('http.use_proxy',
:default => false, :desc => "should a proxy be used for HTTP requests?")
Bot::Config.register Bot::Config::StringValue.new('http.proxy_uri', :default => false,
@cache = Hash.new
@headers = {
'Accept-Charset' => 'utf-8;q=1.0, *;q=0.8',
- 'Accept-Encoding' => 'gzip;q=1, identity;q=0.8, *;q=0.2',
+ 'Accept-Encoding' => 'gzip;q=1, deflate;q=1, identity;q=0.8, *;q=0.2',
'User-Agent' =>
- "rbot http util #{$version} (http://linuxbrit.co.uk/rbot/)"
+ "rbot http util #{$version} (#{Irc::Bot::SOURCE_URL})"
}
debug "starting http cache cleanup timer"
@timer = @bot.timer.add(300) {
#
def get_proxy(uri, options = {})
opts = {
- :read_timeout => 10,
- :open_timeout => 20
+ :read_timeout => @bot.config["http.read_timeout"],
+ :open_timeout => @bot.config["http.open_timeout"]
}.merge(options)
proxy = nil
# _uri_:: uri to query (URI object or String)
# _nbytes_:: number of bytes to get
#
- # Partia GET request, returns (if possible) the first _nbytes_ bytes of the
+ # Partial GET request, returns (if possible) the first _nbytes_ bytes of the
# response body, following redirs and caching if requested, yielding the
# actual response(s) to the optional block. See get_response for details on
# the supported _options_