summary refs log tree commit
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-11-27 11:30:49 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2014-11-27 11:30:49 -0200
commitbe3e305a17a091cfcf8dd6aa8888cd70d623c3f1 (patch)
tree8adbd9abc8f69b99a4257109a8cf98eabde866bd
parent9bbca97dc004c8e37ba6c874f23db8dfeab8c7c3 (diff)
downloadrack-be3e305a17a091cfcf8dd6aa8888cd70d623c3f1.tar.gz
Fix #639 wrong merge
-rw-r--r--lib/rack/multipart/parser.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/rack/multipart/parser.rb b/lib/rack/multipart/parser.rb
index faa98c7e..e6e03538 100644
--- a/lib/rack/multipart/parser.rb
+++ b/lib/rack/multipart/parser.rb
@@ -18,7 +18,8 @@ module Rack
         content_length = env['CONTENT_LENGTH']
         content_length = content_length.to_i if content_length
 
-        tempfile = env['rack.multipart.tempfile_factory'] || lambda { |filename, content_type| Tempfile.new("RackMultipart") }
+        tempfile = env['rack.multipart.tempfile_factory'] ||
+          lambda { |filename, content_type| Tempfile.new(["RackMultipart", ::File.extname(filename)]) }
         bufsize = env['rack.multipart.buffer_size'] || BUFSIZE
 
         new($1, io, content_length, env, tempfile, bufsize)