From 1f7886b50fd9ac9b9d82551b046d6a29388b6191 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Wed, 24 Aug 2016 17:21:31 +0300 Subject: [PATCH 1/2] Ignore invalid Content-Disposition header (#2284) * ignore invalid content-disposition header [fixes #2283] --- lib/paperclip/io_adapters/uri_adapter.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/paperclip/io_adapters/uri_adapter.rb b/lib/paperclip/io_adapters/uri_adapter.rb index 368096ac6..775aff732 100644 --- a/lib/paperclip/io_adapters/uri_adapter.rb +++ b/lib/paperclip/io_adapters/uri_adapter.rb @@ -30,8 +30,9 @@ def content_type_from_content def filename_from_content_disposition if @content.meta.has_key?("content-disposition") - @content.meta["content-disposition"]. - match(/filename="([^"]*)"/)[1] + matches = @content.meta["content-disposition"]. + match(/filename="([^"]*)"/) + matches[1] if matches end end From 856d36eb9220997e039862f734b14d2ad263a229 Mon Sep 17 00:00:00 2001 From: Josh Bielick Date: Wed, 23 Aug 2017 10:58:01 -0400 Subject: [PATCH 2/2] Release v4.3.8 backport invalid content-disposition fix (#2284) This release adds the invalid content-disposition header fix (#2284) commit to the 4.3 version history to backport that bugfix for the <5.0 releases fixes #2283 --- NEWS | 4 ++++ lib/paperclip/version.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 0b4b031a0..d58349e64 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +4.3.8 (8/23/2017): + +* Bug Fix: Backport "Ignore invalid content-disposition header (#2284)" to 4.3 + 4.3.7 (7/1/2016): * Add deprecation warnings diff --git a/lib/paperclip/version.rb b/lib/paperclip/version.rb index 4e39e076c..da779bc90 100644 --- a/lib/paperclip/version.rb +++ b/lib/paperclip/version.rb @@ -1,3 +1,3 @@ module Paperclip - VERSION = "4.3.7".freeze unless defined? Paperclip::VERSION + VERSION = "4.3.8".freeze unless defined? Paperclip::VERSION end