diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-10-26 17:32:42 -0700 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-10-26 17:32:42 -0700 |
commit | e1786ee6ebee9fab10d6756be1eeacbbe6b65b48 (patch) | |
tree | 403392cf338502f200949f6c59dfcd4be30c1e79 /actionpack/lib/action_dispatch/http/response.rb | |
parent | d7499f8ee8faa80d12dccae5baf5ab2acc79e77d (diff) | |
download | rails-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_dispatch/http/response.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index 3e3b473178..b3ed7c9d1a 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -270,6 +270,8 @@ module ActionDispatch # :nodoc: if control.empty? headers["Cache-Control"] = DEFAULT_CACHE_CONTROL + elsif @cache_control[:no_cache] + headers["Cache-Control"] = "no-cache" else extras = control[:extras] max_age = control[:max_age] |