diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-01-11 11:21:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 11:21:53 -0800 |
| commit | 74bef0970fff60eaf5faefde30a23f3c36c0b3ee (patch) | |
| tree | 628b6013130e0d2868b2afbac3f00f24629dbb9c /actionpack/lib/action_dispatch | |
| parent | 1e923b498492424ae627d7a2c61339148f887503 (diff) | |
| parent | 3a1b2a21965c0cd7bcccff586ce04b029eb4c359 (diff) | |
| download | rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.gz rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.bz2 rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.zip | |
Merge branch 'master' into ac_params_exists
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/cache.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb index f67b13f657..8cc84ff36c 100644 --- a/actionpack/lib/action_dispatch/http/cache.rb +++ b/actionpack/lib/action_dispatch/http/cache.rb @@ -197,10 +197,12 @@ module ActionDispatch if control.empty? # Let middleware handle default behavior elsif control[:no_cache] - self._cache_control = NO_CACHE - if control[:extras] - self._cache_control = _cache_control + ", #{control[:extras].join(', ')}" - end + options = [] + options << PUBLIC if control[:public] + options << NO_CACHE + options.concat(control[:extras]) if control[:extras] + + self._cache_control = options.join(", ") else extras = control[:extras] max_age = control[:max_age] |