diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-01 22:01:26 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-01 22:01:26 +0100 |
| commit | 912eb28223c937a679bd2c78ea139033f7796b26 (patch) | |
| tree | d7b119bb5627d0814a0177070bf12ba15c939f15 /phpBB/includes/functions_transfer.php | |
| parent | ce35aa8b0b90870608a5b0782a36c6aedad8c7e4 (diff) | |
| parent | 00682db8a625e40f720c513c72267395c4354766 (diff) | |
| download | forums-912eb28223c937a679bd2c78ea139033f7796b26.tar forums-912eb28223c937a679bd2c78ea139033f7796b26.tar.gz forums-912eb28223c937a679bd2c78ea139033f7796b26.tar.bz2 forums-912eb28223c937a679bd2c78ea139033f7796b26.tar.xz forums-912eb28223c937a679bd2c78ea139033f7796b26.zip | |
Merge pull request #5718 from rubencm/ticket/16189
[ticket/16189] Deprecate inet_ntop and inet_pton wrappers
Diffstat (limited to 'phpBB/includes/functions_transfer.php')
| -rw-r--r-- | phpBB/includes/functions_transfer.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php index 7427b89917..f0070b4b1e 100644 --- a/phpBB/includes/functions_transfer.php +++ b/phpBB/includes/functions_transfer.php @@ -810,7 +810,7 @@ class ftp_fsock extends transfer $server_ip = substr($socket_name, 0, strrpos($socket_name, ':')); } - if (!isset($server_ip) || preg_match(get_preg_expression('ipv4'), $server_ip)) + if (isset($server_ip) && filter_var($server_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) // ipv4 { // Passive mode $this->_send_command('PASV', '', false); @@ -831,7 +831,7 @@ class ftp_fsock extends transfer $server_ip = $temp[0] . '.' . $temp[1] . '.' . $temp[2] . '.' . $temp[3]; $server_port = $temp[4] * 256 + $temp[5]; } - else + else // ipv6 { // Extended Passive Mode - RFC2428 $this->_send_command('EPSV', '', false); |