diff options
Diffstat (limited to 'actionpack/lib/action_controller/streaming.rb')
| -rw-r--r-- | actionpack/lib/action_controller/streaming.rb | 11 |
1 files changed, 10 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 |