From 58bcd50f7f8c187f8c0bd4a1d52aecafd76979fc Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 11 May 2017 23:14:00 +0200 Subject: 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 tags when sanitizing (microformats) --- app/services/process_feed_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/services/process_feed_service.rb') diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index 70c05c938..1558f8790 100644 --- 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 -- cgit