mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
Dammit, now this should be the good one.
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3411 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -154,13 +154,8 @@ if( getenv('HTTP_X_FORWARDED_FOR') != '' )
|
||||
|
||||
if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) )
|
||||
{
|
||||
<<<<<<< common.php
|
||||
$private_ip = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10\..*/', '/^224\..*/', '/^240\..*/');
|
||||
$client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
|
||||
=======
|
||||
$private_ip = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10.\.*/', '/^224.\.*/', '/^240.\.*/');
|
||||
$client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
|
||||
>>>>>>> 1.74.2.5
|
||||
}
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user