Fix #1426 - Trim long usernames in public follower/following lists (#2993)

Fix #2221 - Catch OpenSSL exceptions when loading remote avatars/headers/attachments Don't strip "rel" attribute from <a> tags when sanitizing (microformats)
2017-05-11 23:14:00 +02:00
parent 60ecfb87ae
commit 58bcd50f7f
5 changed files with 6 additions and 4 deletions
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@ -223,7 +223,7 @@ class ProcessFeedService < BaseService
        begin
          media.file_remote_url = link['href']
          media.save
-        rescue OpenURI::HTTPError, Paperclip::Errors::NotIdentifiedByImageMagickError
+        rescue OpenURI::HTTPError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError
          next
        end
      end