diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-11-01 13:03:08 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-11-01 13:03:08 -0700 |
| commit | 2e20a7d9f7555ec50ba6b364ba5a5861c5f9bc95 (patch) | |
| tree | b53e92bab09cdb6eade08882ce5bf4e4a730f071 /actionpack/lib/action_dispatch | |
| parent | 694334c37a95e85e686b121ce5cb2ccb4114e6b5 (diff) | |
| parent | 43aa2d308c27f387f2ea3051170769bb60b99015 (diff) | |
| download | rails-2e20a7d9f7555ec50ba6b364ba5a5861c5f9bc95.tar.gz rails-2e20a7d9f7555ec50ba6b364ba5a5861c5f9bc95.tar.bz2 rails-2e20a7d9f7555ec50ba6b364ba5a5861c5f9bc95.zip | |
Merge pull request #8019 from lest/patch-1
memoize calculated ip without additional variable
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/remote_ip.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb index ec15a2a715..5abf8f2802 100644 --- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb +++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb @@ -63,9 +63,9 @@ module ActionDispatch }x def initialize(env, middleware) - @env = env - @middleware = middleware - @calculated_ip = false + @env = env + @middleware = middleware + @ip = nil end # Determines originating IP address. REMOTE_ADDR is the standard @@ -100,9 +100,7 @@ module ActionDispatch end def to_s - return @ip if @calculated_ip - @calculated_ip = true - @ip = calculate_ip + @ip ||= calculate_ip end private |