diff options
| author | rubencm <rubencm@gmail.com> | 2019-10-24 20:03:32 +0000 |
|---|---|---|
| committer | rubencm <rubencm@gmail.com> | 2019-11-01 10:30:41 +0000 |
| commit | b6a99e7dcad10836cd2277ba2bd9a6c19afe90f1 (patch) | |
| tree | 7e2292e84aa12d68424a0f945fd2d1330bc0e467 /phpBB/phpbb | |
| parent | f09f5bc51c15eef526374105d6443270dc1172bf (diff) | |
| download | forums-b6a99e7dcad10836cd2277ba2bd9a6c19afe90f1.tar forums-b6a99e7dcad10836cd2277ba2bd9a6c19afe90f1.tar.gz forums-b6a99e7dcad10836cd2277ba2bd9a6c19afe90f1.tar.bz2 forums-b6a99e7dcad10836cd2277ba2bd9a6c19afe90f1.tar.xz forums-b6a99e7dcad10836cd2277ba2bd9a6c19afe90f1.zip | |
[ticket/16188] Remove some legacy code and fix bug
PHPBB3-16189
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/session.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index edd9e23c6b..7c76c08b73 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -250,8 +250,7 @@ class session $ips = explode(' ', $this->forwarded_for); foreach ($ips as $ip) { - // check IPv4 first, the IPv6 is hopefully only going to be used very seldom - if (!empty($ip) && !preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip)) + if (!filter_var($ip, FILTER_VALIDATE_IP)) { // contains invalid data, don't use the forwarded for header $this->forwarded_for = ''; |