aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/conditional_get.rb
diff options
context:
space:
mode:
authorNate Berkopec <nate.berkopec@gmail.com>2016-08-01 12:31:39 -0700
committerNate Berkopec <nate.berkopec@gmail.com>2016-09-06 19:52:10 -0700
commit0d1deb31eb2202acc8b2275163bb7440c9458de9 (patch)
tree228dbb847dbbadef7bfada853f7a61b7bd9c3bd8 /actionpack/lib/action_controller/metal/conditional_get.rb
parentc205e3fca333e7c24dd1e36d439f83cdaf074e44 (diff)
downloadrails-0d1deb31eb2202acc8b2275163bb7440c9458de9.tar.gz
rails-0d1deb31eb2202acc8b2275163bb7440c9458de9.tar.bz2
rails-0d1deb31eb2202acc8b2275163bb7440c9458de9.zip
Clarify expires_now documentation
[ci skip]
Diffstat (limited to 'actionpack/lib/action_controller/metal/conditional_get.rb')
-rw-r--r--actionpack/lib/action_controller/metal/conditional_get.rb5
1 files changed, 3 insertions, 2 deletions
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 <tt>no-cache</tt> so no caching should
- # occur by the browser or intermediate caches (like caching proxy servers).
+ # Sets an HTTP 1.1 Cache-Control header of <tt>no-cache</tt>. 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