Release 5.1.1

NEWS

@@ -8,6 +8,10 @@ master:
 * (port from 4.3) Uri io adapter uses the content-disposition filename (#2250)
 * General refactors and documentation improvements
 
+5.1.1 (2017-12-14)
+
+* Bug Fix: Backport "Ignore invalid content-disposition header (#2284)" to 5.1
+
 5.0.0 (2016-07-01):
 
 * Improvement: Add `read_timeout` configuration for URI Adapter download_content method.

lib/paperclip/io_adapters/uri_adapter.rb

@@ -29,8 +29,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
 

lib/paperclip/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   unless defined?(Paperclip::VERSION)
-    VERSION = "5.1.0".freeze
+    VERSION = "5.1.1".freeze
   end
 end