diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-06-30 19:34:26 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-06-30 19:34:26 -0300 |
| commit | 9c70442534c7754eac3738e0ddf11446b01c4f9e (patch) | |
| tree | 7af8614ad91e7400735a6be1b36dca704d87e3b6 /actionpack/lib/action_controller/base/streaming.rb | |
| parent | 50f73bd39c729b4ba4b5215b608e5767ab0aa7a1 (diff) | |
| parent | b5dfdc714fab7d2836e0a979ca88b4a17db9ec06 (diff) | |
| download | rails-9c70442534c7754eac3738e0ddf11446b01c4f9e.tar.gz rails-9c70442534c7754eac3738e0ddf11446b01c4f9e.tar.bz2 rails-9c70442534c7754eac3738e0ddf11446b01c4f9e.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/test/cases/adapter_test.rb
Diffstat (limited to 'actionpack/lib/action_controller/base/streaming.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base/streaming.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base/streaming.rb b/actionpack/lib/action_controller/base/streaming.rb index 70a97ccfec..9ff4f25f43 100644 --- a/actionpack/lib/action_controller/base/streaming.rb +++ b/actionpack/lib/action_controller/base/streaming.rb @@ -168,7 +168,7 @@ module ActionController #:nodoc: end headers.merge!( - 'Content-Length' => options[:length], + 'Content-Length' => options[:length].to_s, 'Content-Disposition' => disposition, 'Content-Transfer-Encoding' => 'binary' ) |