diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-10-09 02:48:01 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-10-09 02:48:01 -0700 |
| commit | 29e704d98bec8783d45f58b639972973f18be016 (patch) | |
| tree | b04da83592b9b86e225a6a36e2bedcd6d7932cf3 /actionpack/CHANGELOG.md | |
| parent | 09b3b76f77aa6c033566eb4abd011b41604aeacc (diff) | |
| parent | 8642c2aadc94b6763290711384c265289b02faaa (diff) | |
| download | rails-29e704d98bec8783d45f58b639972973f18be016.tar.gz rails-29e704d98bec8783d45f58b639972973f18be016.tar.bz2 rails-29e704d98bec8783d45f58b639972973f18be016.zip | |
Merge pull request #12083 from BlueHotDog/fixing_respond_with
Fixing repond_with working directly on the options hash
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. |