GetIp#to_s should never return nil. That's icky.

1 files changed, 6 insertions, 3 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index ee0d19a50d..77aa4e743e 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -55,7 +55,10 @@ module ActionDispatch
             "HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
         end
 
-        client_ip || forwarded_ips.last || remote_addrs.first
+        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
       end
 
       def to_s
@@ -66,9 +69,9 @@ module ActionDispatch
 
     protected
 
-      def ips_from(header)
+      def ips_from(header, allow_proxies = false)
         ips = @env[header] ? @env[header].strip.split(/[,\s]+/) : []
-        ips.reject{|ip| ip =~ @middleware.proxies }
+        allow_proxies ? ips : ips.reject{|ip| ip =~ @middleware.proxies }
       end
     end