Merge branch 'master' into reagent/master

cerebelo · Mar 1, 2010 · 819c50c · 819c50c
2 parents ad7fdaf + 4eb14c5
commit 819c50c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/feedbag.gemspec b/feedbag.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{feedbag}
-  s.version = "0.5.99"
+  s.version = "0.5.100"
 	s.homepage = "http://axiombox.com/feedbag"
 	s.rubyforge_project = "feedbag"
 

diff --git a/lib/feedbag.rb b/lib/feedbag.rb
@@ -86,7 +86,11 @@ def self.find(url, args = {})
 
 		begin
 			html = open(url) do |f|
-				if @content_types.include?(f.content_type.downcase)
+				content_type = f.content_type.downcase
+				if content_type == "application/octet-stream" # open failed
+				  content_type = f.meta["content-type"].gsub(/;.*$/, '')
+				end
+				if @content_types.include?(content_type)
 					return self.add_feed(url, nil)
 				end