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'
         );