aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorRafael França <rafael@franca.dev>2019-07-26 13:43:10 -0400
committerGitHub <noreply@github.com>2019-07-26 13:43:10 -0400
commitf45e23ead96507c2bb582c223f2615ca71244312 (patch)
tree78e56f72c4477cd829f7e1f190e602649bd6faef /actionpack/lib/action_controller
parenta40da823d729296514f310d13a09ce8e0b37b699 (diff)
parent5745a3c0928ee5604ce80af19348efb42189f1d6 (diff)
downloadrails-f45e23ead96507c2bb582c223f2615ca71244312.tar.gz
rails-f45e23ead96507c2bb582c223f2615ca71244312.tar.bz2
rails-f45e23ead96507c2bb582c223f2615ca71244312.zip
Merge pull request #36213 from st0012/fix-25842
Add `Vary: Accept` header when using `Accept` header for response
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index efa5de313c..fd22c4fa64 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -77,6 +77,10 @@ module ActionController
end
end
+ def _set_vary_header
+ self.headers["Vary"] = "Accept" if request.should_apply_vary_header?
+ end
+
# Normalize arguments by catching blocks and setting them on :update.
def _normalize_args(action = nil, options = {}, &blk)
options = super