--- old/samizdat/helpers/import_feeds_helper.rb~ 2007-05-18 16:23:44.000000000 -0500 +++ samizdat/helpers/import_feeds_helper.rb 2007-07-08 09:17:58.157086648 -0500 @@ -19,7 +19,7 @@ require 'rss/1.0' require 'rss/dublincore' require 'rss/2.0' - +require 'timeout' # TODO: The format_date method is from template.rb. In principle, # imported feeds should (could) be treated as resources - somewhat @@ -78,12 +79,13 @@ response= "" valid_URI=0 begin + status = Timeout::timeout(10) { open(anURI.untaint, -# "Accept-Language" => config['locale']['languages'][0]) do |file| "Accept-Language" => lang) do |file| response += file.read valid_URI=1 end + } rescue SocketError valid_URI=0 import_feeds_body += _('