diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-02-07 16:18:09 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-02-07 16:18:09 -0600 |
| commit | 524d8edf68ab94315a128cbd7570d1cf4faf7d7a (patch) | |
| tree | 9216f1a68194be1bc27a9e83de40205e1c419f4e /actionpack/lib/action_controller/streaming.rb | |
| parent | 0edb0a4facdf6de8d12a004b59232e1006b93cd9 (diff) | |
| download | rails-524d8edf68ab94315a128cbd7570d1cf4faf7d7a.tar.gz rails-524d8edf68ab94315a128cbd7570d1cf4faf7d7a.tar.bz2 rails-524d8edf68ab94315a128cbd7570d1cf4faf7d7a.zip | |
Update bundled Rack for Ruby 1.9 spec changes
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 e1786913a7..b6a6a2e5db 100644 --- a/actionpack/lib/action_controller/streaming.rb +++ b/actionpack/lib/action_controller/streaming.rb @@ -152,7 +152,7 @@ module ActionController #:nodoc: end content_type = content_type.to_s.strip # fixes a problem with extra '\r' with some browsers - headers.update( + headers.merge!( 'Content-Length' => options[:length], 'Content-Type' => content_type, 'Content-Disposition' => disposition, |