diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-27 14:16:01 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-27 14:16:01 -0700 |
| commit | bf203e471b0d98b808f98256b93b217c4f0f5a1a (patch) | |
| tree | 8ff80e4018fcc63e33a2aa01281adcda76c96a2a /actionpack/lib/action_controller | |
| parent | cae2b5bb59212961c4a35c939381ebece48d1177 (diff) | |
| download | rails-bf203e471b0d98b808f98256b93b217c4f0f5a1a.tar.gz rails-bf203e471b0d98b808f98256b93b217c4f0f5a1a.tar.bz2 rails-bf203e471b0d98b808f98256b93b217c4f0f5a1a.zip | |
Revert "this always sets :public to false, so just do that"
This reverts commit cae2b5bb59212961c4a35c939381ebece48d1177.
I am an idiot.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/data_streaming.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |