Commit fe6f1690 authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4808 (No need to check LOCAL_ADDR in code)

parent 41d39c34

sources/files2.php

+1 −4
Original line number Diff line number Diff line
@@ -1067,10 +1067,7 @@ function _http_download_file($url, $byte_limit = null, $trigger_error = true, $n 
    $do_ip_forwarding = (preg_replace('#^www\.#', '', $base_url_parsed['host']) == preg_replace('#^www\.#', '', $connect_to)) && ($config_ip_forwarding != '') && ($config_ip_forwarding != '0');

    if ($do_ip_forwarding) { // For cases where we have IP-forwarding, and a strong firewall (i.e. blocked to our own domain's IP by default)

        if ($config_ip_forwarding == '1') {

            $connect_to = cms_srv('LOCAL_ADDR');

            if ($connect_to == '') {

            $connect_to = cms_srv('SERVER_ADDR');

            }

            if ($connect_to == '') {

                $connect_to = '127.0.0.1'; // "localhost" can fail due to IP6

            }

sources_custom/hooks/systems/health_checks/performance.php

+1 −4
Original line number Diff line number Diff line
@@ -103,10 +103,7 @@ class Hook_health_check_performance extends Hook_Health_Check 
                return $url;



            case '1':

                $connect_to = cms_srv('LOCAL_ADDR');

                if ($connect_to == '') {

                $connect_to = cms_srv('SERVER_ADDR');

                }

                if ($connect_to == '') {

                    $connect_to = '127.0.0.1'; // "localhost" can fail due to IP6

                }