Permalink
Browse files

Fixed that send_file would "remember" all the files sent by adding to…

… the headers again and again #458 [bitsweat]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@400 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 5f5b053 commit 96e54780b34ea6e8d8f972ff1f0b305aee44430c @dhh dhh committed Jan 13, 2005
Showing with 30 additions and 4 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +4 −4 actionpack/lib/action_controller/base.rb
  3. +24 −0 actionpack/test/controller/send_file_test.rb
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that send_file would "remember" all the files sent by adding to the headers again and again #458 [bitsweat]
+
* Fixed url rewriter confusion when the controller or action name was a substring of the controller_prefix or action_prefix
* Added conditional layouts like <tt>layout "weblog_standard", :except => :rss</tt> #452 [Marcel Molina]
@@ -178,11 +178,11 @@ class Base
DEFAULT_RENDER_STATUS_CODE = "200 OK"
DEFAULT_SEND_FILE_OPTIONS = {
- :type => 'application/octet_stream',
- :disposition => 'attachment',
+ :type => 'application/octet_stream'.freeze,
+ :disposition => 'attachment'.freeze,
:stream => true,
:buffer_size => 4096
- }
+ }.freeze
# Determines whether the view has access to controller internals @request, @response, @session, and @template.
# By default, it does.
@@ -664,7 +664,7 @@ def send_file_headers!(options)
raise ArgumentError, ":#{arg} option required" if options[arg].nil?
end
- disposition = options[:disposition] || 'attachment'
+ disposition = options[:disposition].dup || 'attachment'
disposition <<= %(; filename="#{options[:filename]}") if options[:filename]
@headers.update(
@@ -65,4 +65,28 @@ def test_data
assert_kind_of String, response.body
assert_equal file_data, response.body
end
+
+ # Test that send_file_headers! is setting the correct HTTP headers.
+ def test_send_file_headers!
+ options = {
+ :length => 1,
+ :type => 'type',
+ :disposition => 'disposition',
+ :filename => 'filename'
+ }
+
+ # Do it a few times: the resulting headers should be identical
+ # no matter how many times you send with the same options.
+ # Test resolving Ticket #458.
+ @controller.headers = {}
+ @controller.send(:send_file_headers!, options)
+ @controller.send(:send_file_headers!, options)
+ @controller.send(:send_file_headers!, options)
+
+ h = @controller.headers
+ assert_equal 1, h['Content-Length']
+ assert_equal 'type', h['Content-Type']
+ assert_equal 'disposition; filename="filename"', h['Content-Disposition']
+ assert_equal 'binary', h['Content-Transfer-Encoding']
+ end
end

0 comments on commit 96e5478

Please sign in to comment.