From 50777ca41b72eb97e7001034dd100b86bd0d6448 Mon Sep 17 00:00:00 2001 From: Patrick Toomey Date: Tue, 22 Aug 2017 15:47:48 -0600 Subject: Let middleware handle default cache behavior --- actionpack/lib/action_dispatch/http/cache.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch/http') 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] -- cgit v1.2.3