aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorPatrick Toomey <ptoomey3@biasedcoin.com>2017-08-22 15:47:48 -0600
committerPatrick Toomey <ptoomey3@biasedcoin.com>2017-08-22 15:47:48 -0600
commit50777ca41b72eb97e7001034dd100b86bd0d6448 (patch)
tree8c3bbd654f8e06bcb370e01b5943df4a1a0f9a05 /actionpack
parent2b4c547ea803e3de8684b7cc3665b9a1cd0e6d3a (diff)
downloadrails-50777ca41b72eb97e7001034dd100b86bd0d6448.tar.gz
rails-50777ca41b72eb97e7001034dd100b86bd0d6448.tar.bz2
rails-50777ca41b72eb97e7001034dd100b86bd0d6448.zip
Let middleware handle default cache behavior
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/http/cache.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb
index eaff10cb54..468a53e202 100644
--- a/actionpack/lib/action_dispatch/http/cache.rb
+++ b/actionpack/lib/action_dispatch/http/cache.rb
@@ -189,7 +189,8 @@ module ActionDispatch
control.merge! cache_control
if control.empty?
- self._cache_control = DEFAULT_CACHE_CONTROL
+ # Let middleware handle default behavior
+ self._cache_control = nil
elsif control[:no_cache]
self._cache_control = NO_CACHE
if control[:extras]