summaryrefslogtreecommitdiff
path: root/inc/common.php
diff options
context:
space:
mode:
authorMarcel Pennewiß <dokuwiki@pennewiss.de>2010-07-16 09:53:08 +0200
committerAndreas Gohr <andi@splitbrain.org>2010-07-16 09:53:08 +0200
commit5cbeffbf8d4376729601d85a73bd2a43c8eed4ce (patch)
treee6f18cac7265eee746ebc463c61b21b4648ee79d /inc/common.php
parent163ad9f2399a52f60868a2454c1113e214c1bfea (diff)
downloadrpg-5cbeffbf8d4376729601d85a73bd2a43c8eed4ce.tar.gz
rpg-5cbeffbf8d4376729601d85a73bd2a43c8eed4ce.tar.bz2
Strip whitespace from X-FORWARDED-FOR FS#1996
Diffstat (limited to 'inc/common.php')
-rw-r--r--inc/common.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/common.php b/inc/common.php
index 513b006c2..bf5987c28 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -594,9 +594,9 @@ function clientIP($single=false){
$ip = array();
$ip[] = $_SERVER['REMOTE_ADDR'];
if(!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
- $ip = array_merge($ip,explode(',',$_SERVER['HTTP_X_FORWARDED_FOR']));
+ $ip = array_merge($ip,explode(',',str_replace(' ','',$_SERVER['HTTP_X_FORWARDED_FOR'])));
if(!empty($_SERVER['HTTP_X_REAL_IP']))
- $ip = array_merge($ip,explode(',',$_SERVER['HTTP_X_REAL_IP']));
+ $ip = array_merge($ip,explode(',',str_replace(' ','',$_SERVER['HTTP_X_REAL_IP'])));
// some IPv4/v6 regexps borrowed from Feyd
// see: http://forums.devnetwork.net/viewtopic.php?f=38&t=53479