From 0d1deb31eb2202acc8b2275163bb7440c9458de9 Mon Sep 17 00:00:00 2001 From: Nate Berkopec Date: Mon, 1 Aug 2016 12:31:39 -0700 Subject: Clarify expires_now documentation [ci skip] --- actionpack/lib/action_controller/metal/conditional_get.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_controller/metal/conditional_get.rb') diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index e21449f376..e27890405a 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -242,8 +242,9 @@ module ActionController response.date = Time.now unless response.date? end - # Sets an HTTP 1.1 Cache-Control header of no-cache so no caching should - # occur by the browser or intermediate caches (like caching proxy servers). + # Sets an HTTP 1.1 Cache-Control header of no-cache. This means the + # resource will be marked as stale, so clients must always revalidate. + # Intermediate/browser caches may still store the asset. def expires_now response.cache_control.replace(:no_cache => true) end -- cgit v1.2.3