aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-01-22 14:48:59 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-01-22 14:48:59 +0000
commitd336ca5280523c4f4c9387d8a6778273469f856c (patch)
treec00139c9c8b46cffcffbfdf3b0cbc12af6d7afac /actionpack/lib
parent38ee39a4a5e719694dca553ef739dbf99645c2b2 (diff)
downloadrails-d336ca5280523c4f4c9387d8a6778273469f856c.tar.gz
rails-d336ca5280523c4f4c9387d8a6778273469f856c.tar.bz2
rails-d336ca5280523c4f4c9387d8a6778273469f856c.zip
Fixed that the content-header was being set to application/octet_stream instead of application/octet-stream on send_date/file [Alexey]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@475 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rwxr-xr-xactionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 37e3269aa8..a11c86b107 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -189,7 +189,7 @@ module ActionController #:nodoc:
DEFAULT_RENDER_STATUS_CODE = "200 OK"
DEFAULT_SEND_FILE_OPTIONS = {
- :type => 'application/octet_stream'.freeze,
+ :type => 'application/octet-stream'.freeze,
:disposition => 'attachment'.freeze,
:stream => true,
:buffer_size => 4096