diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-02 23:46:00 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-02 23:46:00 -0200 |
| commit | d002826e54415a340e55fdbf363d005faebf8fc5 (patch) | |
| tree | 431146dfb0b15c4507fd49bb7d6f18bd40ccf839 /actionpack/lib/action_dispatch/http/response.rb | |
| parent | 9ba83cce0318fa5051764f4a16c286adf30169e2 (diff) | |
| parent | 14370e1aab6ddfb5b86cf50bd7e5abcebae0684c (diff) | |
| download | rails-d002826e54415a340e55fdbf363d005faebf8fc5.tar.gz rails-d002826e54415a340e55fdbf363d005faebf8fc5.tar.bz2 rails-d002826e54415a340e55fdbf363d005faebf8fc5.zip | |
Merge branch 'master' of git://github.com/rails/rails
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] |