Merge branch 'issue227' of https://github.com/johnbellone/CodeIgniter …

…into develop
iufer · Aug 21, 2011 · 38e4a77 · 38e4a77
2 parents 1e4276d + 16f27b4
commit 38e4a77
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/system/core/Input.php b/system/core/Input.php
@@ -323,13 +323,13 @@ function ip_address()
 
  $this->ip_address = in_array($_SERVER['REMOTE_ADDR'], $proxies) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR'];
  }
- elseif ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP'))
+ elseif (! $this->server('HTTP_CLIENT_IP') AND $this->server('REMOTE_ADDR'))
  {
- $this->ip_address = $_SERVER['HTTP_CLIENT_IP'];
+ $this->ip_address = $_SERVER['REMOTE_ADDR'];
  }
- elseif ($this->server('REMOTE_ADDR'))
+ elseif ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP'))
  {
- $this->ip_address = $_SERVER['REMOTE_ADDR'];
+ $this->ip_address = $_SERVER['HTTP_CLIENT_IP'];
  }
  elseif ($this->server('HTTP_CLIENT_IP'))
  {