diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-07 09:54:51 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-02-07 09:54:51 -0800 |
| commit | 275c3a1cb3d0f38d1a28b1a8d6145a4d7e379acc (patch) | |
| tree | e6c4509e4f6d45d2cd9ff0473abe9ae2c4a1b147 /actionpack/lib | |
| parent | abe4a8d070d069f24f7befd9a8da25c40f4c2a6d (diff) | |
| parent | 6a720226aad2adffcbd2422d40db772719579e2f (diff) | |
| download | rails-275c3a1cb3d0f38d1a28b1a8d6145a4d7e379acc.tar.gz rails-275c3a1cb3d0f38d1a28b1a8d6145a4d7e379acc.tar.bz2 rails-275c3a1cb3d0f38d1a28b1a8d6145a4d7e379acc.zip | |
Merge pull request #2490 from gsterndale/x_forwarded_for_order
The first IP address in the X-Forwarded-For header is the originating IP
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/remote_ip.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb index 70dc2ff531..d924f21fad 100644 --- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb +++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb @@ -59,7 +59,7 @@ module ActionDispatch "HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}" end - not_proxy = client_ip || forwarded_ips.last || remote_addrs.first + not_proxy = client_ip || forwarded_ips.first || remote_addrs.first # Return first REMOTE_ADDR if there are no other options not_proxy || ips_from('REMOTE_ADDR', :allow_proxies).first |