diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-25 20:16:58 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-25 20:16:58 +0000 |
| commit | 9b46f693819008f16cfe319e3dbe7f9d67cd2083 (patch) | |
| tree | 19b3e00a339951b8a6b9eab9033b2bc4a50577f8 /actionpack/lib/action_controller/streaming.rb | |
| parent | 784298008bf25c901564929d319eb631eb1a5639 (diff) | |
| download | rails-9b46f693819008f16cfe319e3dbe7f9d67cd2083.tar.gz rails-9b46f693819008f16cfe319e3dbe7f9d67cd2083.tar.bz2 rails-9b46f693819008f16cfe319e3dbe7f9d67cd2083.zip | |
Allow send_file/send_data to use a registered mime type as the :type parameter #7620 [jonathan]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6233 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/streaming.rb')
| -rw-r--r-- | actionpack/lib/action_controller/streaming.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/streaming.rb b/actionpack/lib/action_controller/streaming.rb index f82d7cf397..2e934067ac 100644 --- a/actionpack/lib/action_controller/streaming.rb +++ b/actionpack/lib/action_controller/streaming.rb @@ -124,7 +124,7 @@ module ActionController #:nodoc: headers.update( 'Content-Length' => options[:length], - 'Content-Type' => options[:type].strip, # fixes a problem with extra '\r' with some browsers + 'Content-Type' => options[:type].to_s.strip, # fixes a problem with extra '\r' with some browsers 'Content-Disposition' => disposition, 'Content-Transfer-Encoding' => 'binary' ) |