Browse files

Revert "Merge pull request #3640 from indirect/remote_ip"

This reverts commit 6491aad, reversing
changes made to 83bf0b6.

See rails#3640 (comment) for
explanation.
  • Loading branch information...
1 parent 6491aad commit 8d1a2b3ecde5a8745b3eaab4763a71d80ca3441f @jonleighton jonleighton committed Nov 15, 2011
View
5 actionpack/lib/action_dispatch/http/request.rb
@@ -155,9 +155,10 @@ def ip
@ip ||= super
end
- # Originating IP address from the RemoteIp middleware.
+ # Originating IP address, usually set by the RemoteIp middleware.
def remote_ip
- @remote_ip ||= @env["action_dispatch.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
end
# Returns the unique request id, which is based off either the X-Request-Id header that can
View
9 actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -55,10 +55,7 @@ def calculate_ip
"HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
end
- not_proxy = client_ip || forwarded_ips.last || remote_addrs.first
-
- # Return first REMOTE_ADDR if there are no other options
- not_proxy || ips_from('REMOTE_ADDR', :all).first
+ client_ip || forwarded_ips.last || remote_addrs.first
end
def to_s
@@ -69,9 +66,9 @@ def to_s
protected
- def ips_from(header, allow_proxies = false)
+ def ips_from(header)
ips = @env[header] ? @env[header].strip.split(/[,\s]+/) : []
- allow_proxies ? ips : ips.reject{|ip| ip =~ @middleware.proxies }
+ ips.reject{|ip| ip =~ @middleware.proxies }
end
end

0 comments on commit 8d1a2b3

Please sign in to comment.