aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-10-26 17:32:42 -0700
committerYehuda Katz <wycats@gmail.com>2009-10-26 17:32:42 -0700
commite1786ee6ebee9fab10d6756be1eeacbbe6b65b48 (patch)
tree403392cf338502f200949f6c59dfcd4be30c1e79 /actionpack/lib/action_controller/metal
parentd7499f8ee8faa80d12dccae5baf5ab2acc79e77d (diff)
downloadrails-e1786ee6ebee9fab10d6756be1eeacbbe6b65b48.tar.gz
rails-e1786ee6ebee9fab10d6756be1eeacbbe6b65b48.tar.bz2
rails-e1786ee6ebee9fab10d6756be1eeacbbe6b65b48.zip
Fixes expires_now and cleans things up a bit
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/conditional_get.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index 52f5a9727e..5156fbc1d5 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -80,7 +80,7 @@ module ActionController
# Sets a HTTP 1.1 Cache-Control header of "no-cache" so no caching should occur by the browser or
# intermediate caches (like caching proxy servers).
def expires_now #:doc:
- response.headers["Cache-Control"] = "no-cache"
+ response.cache_control.replace(:no_cache => true)
end
end
end