diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2011-02-06 15:21:22 +0000 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2011-02-06 15:21:22 +0000 |
| commit | b842a02804e6c492963978620e61739485b7287f (patch) | |
| tree | 00995d07d0c146bbba38a72fa6086547db949080 /inc/common.php | |
| parent | 3893df8e5068f411ba16c2e37096e47c4ad102f2 (diff) | |
| parent | 26497271fdd53b972af0b3a4411b6ce41a0629c0 (diff) | |
| download | rpg-b842a02804e6c492963978620e61739485b7287f.tar.gz rpg-b842a02804e6c492963978620e61739485b7287f.tar.bz2 | |
Merge branch 'master' of git@github.com:splitbrain/dokuwiki
Diffstat (limited to 'inc/common.php')
| -rw-r--r-- | inc/common.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/common.php b/inc/common.php index eab5f1129..23d9c7155 100644 --- a/inc/common.php +++ b/inc/common.php @@ -639,7 +639,7 @@ function clientIP($single=false){ // decide which IP to use, trying to avoid local addresses $ip = array_reverse($ip); foreach($ip as $i){ - if(preg_match('/^(127\.|10\.|192\.168\.|172\.((1[6-9])|(2[0-9])|(3[0-1]))\.)/',$i)){ + if(preg_match('/^(::1|[fF][eE]80:|127\.|10\.|192\.168\.|172\.((1[6-9])|(2[0-9])|(3[0-1]))\.)/',$i)){ continue; }else{ return $i; |