diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-09-16 23:39:01 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-09-16 23:39:01 +0200 |
| commit | cdadda35540d4909a00de01c1671251684e2801f (patch) | |
| tree | c16b5e1eb8c3b27ab50550d5219d24f2667391b4 | |
| parent | 2376f077415814b0a113c1095ad49038e0186a98 (diff) | |
| parent | 41245f9f7ac1f588351ddaa8128b499503416f54 (diff) | |
| download | forums-cdadda35540d4909a00de01c1671251684e2801f.tar forums-cdadda35540d4909a00de01c1671251684e2801f.tar.gz forums-cdadda35540d4909a00de01c1671251684e2801f.tar.bz2 forums-cdadda35540d4909a00de01c1671251684e2801f.tar.xz forums-cdadda35540d4909a00de01c1671251684e2801f.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9091] Extract IPv4 address from addresses mapped into IPv6.
| -rw-r--r-- | phpBB/includes/session.php | 11 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 1 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index d4eac553e9..cc216392b8 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -285,6 +285,17 @@ class session break; } + // Quick check for IPv4-mapped address in IPv6 + if (stripos($ip, '::ffff:') === 0) + { + $ipv4 = substr($ip, 7); + + if (preg_match(get_preg_expression('ipv4'), $ipv4)) + { + $ip = $ipv4; + } + } + // Use the last in chain $this->ip = $ip; } diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 8fd96691d9..ca4ef817be 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -119,6 +119,7 @@ $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false); unset($dbpasswd); $user->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : ''; +$user->ip = (stripos($user->ip, '::ffff:') === 0) ? substr($user->ip, 7) : $user->ip; $sql = "SELECT config_value FROM " . CONFIG_TABLE . " diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 6c23460de9..2dd58584f4 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1236,6 +1236,7 @@ class install_install extends module $current_time = time(); $user_ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : ''; + $user_ip = (stripos($user_ip, '::ffff:') === 0) ? substr($user_ip, 7) : $user_ip; if ($data['script_path'] !== '/') { |