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

2 files changed, 3 insertions, 1 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 7d781b2a53..cbf293e26b 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -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]
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'
         );