Rack gets a newline at the end of the content_type in certain instanc…

…es: 'image/jpeg\r' which causes S3 to be unable to accept the file. Fixes #817
thoughtbot · Sep 7, 2012 · eb92834 · eb92834
1 parent 45bf52a
commit eb92834
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/paperclip/io_adapters/uploaded_file_adapter.rb b/lib/paperclip/io_adapters/uploaded_file_adapter.rb
@@ -15,7 +15,7 @@ def initialize(target)
 
     def cache_current_values
       @original_filename = @target.original_filename
-      @content_type = @target.content_type
+      @content_type = @target.content_type.to_s.strip
       @size = File.size(@target.path)
     end
   end

diff --git a/test/io_adapters/uploaded_file_adapter_test.rb b/test/io_adapters/uploaded_file_adapter_test.rb
@@ -10,7 +10,7 @@ class UploadedFile < OpenStruct; end
 
         @file = UploadedFile.new(
           :original_filename => "5k.png",
-          :content_type => "image/png",
+          :content_type => "image/png\r",
           :head => "",
           :tempfile => tempfile,
           :path => tempfile.path