Permalink
Browse files

Fixed that the content-type for some browsers could include an additi…

…onal \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
  • Loading branch information...
1 parent 023b685 commit 2119e0699a182575349b1c3a311b182e171e097c @dhh dhh committed Apr 10, 2005
Showing with 3 additions and 1 deletion.
  1. +2 −0 actionpack/CHANGELOG
  2. +1 −1 actionpack/lib/action_controller/base.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that the content-type for some browsers could include an additional \r which made wonky things happen #1067 [Thomas Fuchs]
+
* Fixed that radio buttons shouldn't have a default size attribute #1074 [hendrik@mans.de]
* Added ActionView::Helpers::InstanceTag::DEFAULT_RADIO_OPTIONS that contains a hash of default options for radio buttons #1074 [hendrik@mans.de]
@@ -776,7 +776,7 @@ def send_file_headers!(options)
@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'
);

0 comments on commit 2119e06

Please sign in to comment.