Skip to content
Browse files

Merge branch 'master' of git://github.com/pauldix/feedzirra

  • Loading branch information...
2 parents 19692ee + 7e44171 commit 52c74051c028455117820361da4c577ad9f4f828 Kieran Pilkington committed Aug 12, 2009
Showing with 5 additions and 5 deletions.
  1. +1 −1 feedzirra.gemspec
  2. +1 −1 lib/feedzirra.rb
  3. +3 −3 lib/feedzirra/feed.rb
View
2 feedzirra.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{feedzirra}
- s.version = "0.0.16"
+ s.version = "0.0.17"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Paul Dix"]
View
2 lib/feedzirra.rb
@@ -30,5 +30,5 @@
require 'feedzirra/parser/atom_feed_burner'
module Feedzirra
- VERSION = "0.0.16"
+ VERSION = "0.0.17"
end
View
6 lib/feedzirra/feed.rb
@@ -96,7 +96,7 @@ def self.fetch_raw(urls, options = {})
curl.on_success do |c|
responses[url] = decode_content(c)
end
- curl.on_failure do |c|
+ curl.on_failure do |c, err|
responses[url] = c.response_code
end
end
@@ -235,7 +235,7 @@ def self.add_url_to_multi(multi, url, url_queue, responses, options)
end
end
- curl.on_failure do |c|
+ curl.on_failure do |c, err|
add_url_to_multi(multi, url_queue.shift, url_queue, responses, options) unless url_queue.empty?
responses[url] = c.response_code
options[:on_failure].call(url, c.response_code, c.header_str, c.body_str) if options.has_key?(:on_failure)
@@ -284,7 +284,7 @@ def self.add_feed_to_multi(multi, feed, feed_queue, responses, options)
end
end
- curl.on_failure do |c|
+ curl.on_failure do |c, err|
add_feed_to_multi(multi, feed_queue.shift, feed_queue, responses, options) unless feed_queue.empty?
response_code = c.response_code
if response_code == 304 # it's not modified. this isn't an error condition

0 comments on commit 52c7405

Please sign in to comment.
Something went wrong with that request. Please try again.