From bf203e471b0d98b808f98256b93b217c4f0f5a1a Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 27 Aug 2015 14:16:01 -0700 Subject: Revert "this always sets :public to false, so just do that" This reverts commit cae2b5bb59212961c4a35c939381ebece48d1177. I am an idiot. --- actionpack/lib/action_controller/metal/data_streaming.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb index 1586893ace..e6d7f958bb 100644 --- a/actionpack/lib/action_controller/metal/data_streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -169,7 +169,7 @@ module ActionController #:nodoc: # 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 - response.cache_control[:public] = false + response.cache_control[:public] ||= false end end end -- cgit v1.2.3