diff options
| author | Andre Arko <andre@arko.net> | 2011-11-14 16:43:21 -1000 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2011-11-14 16:43:21 -1000 |
| commit | d743954792ccf5975a11ee88cdd690e8f1915728 (patch) | |
| tree | 0eee69ec80417dde9bc8c08822bb83f0e9c28100 /actionpack/lib/action_dispatch/http | |
| parent | c7ab43ff062390205f1508b6476cd354a16eb362 (diff) | |
| download | rails-d743954792ccf5975a11ee88cdd690e8f1915728.tar.gz rails-d743954792ccf5975a11ee88cdd690e8f1915728.tar.bz2 rails-d743954792ccf5975a11ee88cdd690e8f1915728.zip | |
GetIp#to_s should never return nil. That's icky.
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index b10f6b48c7..0e8bd0bd6d 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -155,10 +155,9 @@ module ActionDispatch @ip ||= super end - # Originating IP address, usually set by the RemoteIp middleware. + # Originating IP address from 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"] end # Returns the unique request id, which is based off either the X-Request-Id header that can |