diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-10 15:22:32 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-10 15:22:32 +0000 |
commit | 2119e0699a182575349b1c3a311b182e171e097c (patch) | |
tree | 1139ecefc57a15123a13bf059d83915cb8bdff6e /actionpack/lib/action_controller/base.rb | |
parent | 023b6855eba8ac4694e57d96fba4c5bd3606620b (diff) | |
download | rails-2119e0699a182575349b1c3a311b182e171e097c.tar.gz rails-2119e0699a182575349b1c3a311b182e171e097c.tar.bz2 rails-2119e0699a182575349b1c3a311b182e171e097c.zip |
Fixed that the content-type for some browsers could include an additional \r which made wonky things happen #1067 [Thomas Fuchs]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1130 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index ba0feef98e..e7020421c5 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -776,7 +776,7 @@ module ActionController #:nodoc: @headers.update( 'Content-Length' => options[:length], - 'Content-Type' => options[:type], + 'Content-Type' => options[:type].strip, # fixes a problem with extra '\r' with some browsers 'Content-Disposition' => disposition, 'Content-Transfer-Encoding' => 'binary' ); |