diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-06-19 08:52:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 08:52:16 -0400 |
| commit | 2be5ef6a1d5baebcb749c42a48628c741570fd73 (patch) | |
| tree | b9274f359a069c26b999740125e62eb3f9d59750 /actionpack/lib/action_controller | |
| parent | 433a3122697e41bb46c4f072d2d8223233af5dd4 (diff) | |
| parent | c94a00757dac150b17d9272b72288217c66f0a2d (diff) | |
| download | rails-2be5ef6a1d5baebcb749c42a48628c741570fd73.tar.gz rails-2be5ef6a1d5baebcb749c42a48628c741570fd73.tar.bz2 rails-2be5ef6a1d5baebcb749c42a48628c741570fd73.zip | |
Merge pull request #33134 from dasch/dasch/extra-cache-controls
Add support for more HTTP cache controls
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/conditional_get.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index 06b6a95ff8..4be4557e2c 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -235,7 +235,9 @@ module ActionController response.cache_control.merge!( max_age: seconds, public: options.delete(:public), - must_revalidate: options.delete(:must_revalidate) + must_revalidate: options.delete(:must_revalidate), + stale_while_revalidate: options.delete(:stale_while_revalidate), + stale_if_error: options.delete(:stale_if_error), ) options.delete(:private) |