Fix open/save dialog in IE not opening files send with send_file/send_data, #2279

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2325 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 16 insertions, 1 deletions

diff --git a/actionpack/lib/action_controller/streaming.rb b/actionpack/lib/action_controller/streaming.rb
index 0280522e13..2c4e76f359 100644
--- a/actionpack/lib/action_controller/streaming.rb
+++ b/actionpack/lib/action_controller/streaming.rb
@@ -120,6 +120,7 @@ module ActionController #:nodoc:
         end
 
         disposition = options[:disposition].dup || 'attachment'
+        
         disposition <<= %(; filename="#{options[:filename]}") if options[:filename]
 
         @headers.update(
@@ -127,7 +128,15 @@ module ActionController #:nodoc:
           'Content-Type'              => options[:type].strip,  # fixes a problem with extra '\r' with some browsers
           'Content-Disposition'       => disposition,
           'Content-Transfer-Encoding' => 'binary'
-        );
+        )
+
+        # Fix a problem with IE 6.0 on opening downloaded files:
+        # If Cache-Control: no-cache is set (which Rails does by default), 
+        # IE removes the file it just downloaded from its cache immediately 
+        # after it displays the "open/save" dialog, which means that if you 
+        # hit "open" the file isn't there anymore when the application that 
+        # is called for handling the download is run, so let's workaround that
+        @headers['Cache-Control'] = 'private' if @headers['Cache-Control'] == 'no-cache'
       end
   end
 end
\ No newline at end of file
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 0a1cc256d2..683d6eba60 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -85,5 +85,11 @@ class SendFileTest < Test::Unit::TestCase
     assert_equal 'type', h['Content-Type']
     assert_equal 'disposition; filename="filename"', h['Content-Disposition']
     assert_equal 'binary', h['Content-Transfer-Encoding']
+    
+    # test overriding Cache-Control: no-cache header to fix IE open/save dialog
+    @controller.headers = { 'Cache-Control' => 'no-cache' }
+    @controller.send(:send_file_headers!, options)
+    h = @controller.headers
+    assert_equal 'private', h['Cache-Control']
   end
 end