diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-02 15:27:20 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-02 15:27:20 -0800 |
| commit | c79fb2ac8f7951a2f178413dbbfdeb4d015afacf (patch) | |
| tree | 255a7267c3679a0d8f4ec7ffdb01505858819448 /railties | |
| parent | 9f200fb296da721d50af53712d1e7998a5140e76 (diff) | |
| parent | 75dcdbc84e53cd824c4f1c3e4cb82c40f27010c8 (diff) | |
| download | rails-c79fb2ac8f7951a2f178413dbbfdeb4d015afacf.tar.gz rails-c79fb2ac8f7951a2f178413dbbfdeb4d015afacf.tar.bz2 rails-c79fb2ac8f7951a2f178413dbbfdeb4d015afacf.zip | |
Merge pull request #7980 from steveklabnik/issue_7979
Restore original remote_ip algorithm.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/middleware/remote_ip_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/middleware/remote_ip_test.rb b/railties/test/application/middleware/remote_ip_test.rb index fde13eeb94..f0d3438aa4 100644 --- a/railties/test/application/middleware/remote_ip_test.rb +++ b/railties/test/application/middleware/remote_ip_test.rb @@ -40,7 +40,7 @@ module ApplicationTests end assert_nothing_raised(ActionDispatch::RemoteIp::IpSpoofAttackError) do - assert_equal "1.1.1.2", remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1", "HTTP_CLIENT_IP" => "1.1.1.2") + assert_equal "1.1.1.1", remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1", "HTTP_CLIENT_IP" => "1.1.1.2") end end |