diff options
author | BlueHotDog <dannifriedland@gmail.com> | 2013-08-30 12:53:03 +0300 |
---|---|---|
committer | BlueHotDog <dannifriedland@gmail.com> | 2013-10-09 12:36:26 +0300 |
commit | 8642c2aadc94b6763290711384c265289b02faaa (patch) | |
tree | 0dcbcfc75a2d3b40fb08cddd27808e865dfe46e0 /actionpack/CHANGELOG.md | |
parent | 941516dabcc5fd02eb736f457197bd115c85f2fb (diff) | |
download | rails-8642c2aadc94b6763290711384c265289b02faaa.tar.gz rails-8642c2aadc94b6763290711384c265289b02faaa.tar.bz2 rails-8642c2aadc94b6763290711384c265289b02faaa.zip |
Fixing repond_with working directly on the options hash
This fixes an issue where the respond_with worked directly with the given
options hash, so that if a user relied on it after calling respond_with,
the hash wouldn't be the same.
Fixes #12029
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r-- | actionpack/CHANGELOG.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index dc3e6d5c6a..a2864102cb 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,12 @@ +* Fixing repond_with working directly on the options hash + This fixes an issue where the respond_with worked directly with the given + options hash, so that if a user relied on it after calling respond_with, + the hash wouldn't be the same. + + Fixes #12029 + + *bluehotdog* + * Fix `ActionDispatch::RemoteIp::GetIp#calculate_ip` to only check for spoofing attacks if both `HTTP_CLIENT_IP` and `HTTP_X_FORWARDED_FOR` are set. |