aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-11-16 23:30:45 -0800
committerVijay Dev <vijaydev.cse@gmail.com>2011-11-16 23:30:45 -0800
commite6f3299158fd2b3d34c2fe4ee98097b516d678c0 (patch)
tree0fe6f56796da79d1e8aac129dc7776933db78f3d
parent4148a7ca7dc3f8c2a368068eb248d231aa096b41 (diff)
parentc3ae1d2aec400d6aaea78bd94eb7845b71f1ec15 (diff)
downloadrails-e6f3299158fd2b3d34c2fe4ee98097b516d678c0.tar.gz
rails-e6f3299158fd2b3d34c2fe4ee98097b516d678c0.tar.bz2
rails-e6f3299158fd2b3d34c2fe4ee98097b516d678c0.zip
Merge pull request #3658 from arunagw/fix_initialize_var_name
It should be @calculated_ip not @calculate_ip
-rw-r--r--actionpack/lib/action_dispatch/middleware/remote_ip.rb2
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 8dbe3af6f1..66ece60860 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -35,7 +35,7 @@ module ActionDispatch
def initialize(env, middleware)
@env = env
@middleware = middleware
- @calculate_ip = false
+ @calculated_ip = false
end
# Determines originating IP address. REMOTE_ADDR is the standard