diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-09-30 12:51:37 +0100 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-09-30 12:51:37 +0100 |
| commit | 28b4ffc37917f0552ef6537a15511b37b320d156 (patch) | |
| tree | 367ef3c0183396173a0db9e7aeeec997bc6d4c65 /actionpack | |
| parent | deb91862b93176efd2dc58f81574326256791b92 (diff) | |
| download | rails-28b4ffc37917f0552ef6537a15511b37b320d156.tar.gz rails-28b4ffc37917f0552ef6537a15511b37b320d156.tar.bz2 rails-28b4ffc37917f0552ef6537a15511b37b320d156.zip | |
Add changlog entry for #10844
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index a11cd0b553..dc3e6d5c6a 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,10 @@ +* Fix `ActionDispatch::RemoteIp::GetIp#calculate_ip` to only check for spoofing + attacks if both `HTTP_CLIENT_IP` and `HTTP_X_FORWARDED_FOR` are set. + + Fixes #10844 + + *Tamir Duberstein* + * Strong parameters should permit nested number as key. Fixes #12293 |