diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-16 16:44:09 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-16 16:44:09 -0800 |
| commit | 70f9b74a4988891b6cd824065bb06b7e6e19d43f (patch) | |
| tree | 355dbdeb63fc182f91e7a9152219d9c74b20990d /actionpack/lib/action_dispatch/http/request.rb | |
| parent | 4c1a1933cbc5ab96efe340a3b31ac5fee12c99c8 (diff) | |
| parent | a9044d011790063e17159209f7bb1cbea255d4dd (diff) | |
| download | rails-70f9b74a4988891b6cd824065bb06b7e6e19d43f.tar.gz rails-70f9b74a4988891b6cd824065bb06b7e6e19d43f.tar.bz2 rails-70f9b74a4988891b6cd824065bb06b7e6e19d43f.zip | |
Merge pull request #3649 from indirect/remote_ip
Fixes for Request#remote_ip (no middleware, all proxies)
Diffstat (limited to 'actionpack/lib/action_dispatch/http/request.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index b10f6b48c7..69ca050d0c 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -157,8 +157,7 @@ module ActionDispatch # Originating IP address, usually set by the RemoteIp middleware. def remote_ip - # Coerce the remote_ip object into a string, because to_s could return nil - @remote_ip ||= @env["action_dispatch.remote_ip"].to_s || ip + @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s end # Returns the unique request id, which is based off either the X-Request-Id header that can |