From: julienlusson Date: Mon, 15 Jan 2018 12:51:25 +0000 (+0100) Subject: Disable nested includes warnings for Perl > 5.6. X-Git-Tag: AWSTATS_7_8~30^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F78%2Fhead;p=thirdparty%2FAWStats.git Disable nested includes warnings for Perl > 5.6. --- diff --git a/tools/awstats_buildstaticpages.pl b/tools/awstats_buildstaticpages.pl index 7d89bd04..25e05520 100755 --- a/tools/awstats_buildstaticpages.pl +++ b/tools/awstats_buildstaticpages.pl @@ -183,7 +183,7 @@ sub Parse_Config { # Correct relative include files if ($FileConfig =~ /^(.*[\\\/])[^\\\/]*$/) { $includeFile = "$1$includeFile"; } } - if ($level > 1) { + if ( $level > 1 && $^V lt v5.6.0 ) { warning("Warning: Perl versions before 5.6 cannot handle nested includes"); next; } diff --git a/tools/geoip_generator.pl b/tools/geoip_generator.pl index 4f53b50b..cb5f3b92 100755 --- a/tools/geoip_generator.pl +++ b/tools/geoip_generator.pl @@ -202,7 +202,7 @@ sub Parse_Config { # Correct relative include files if ($FileConfig =~ /^(.*[\\\/])[^\\\/]*$/) { $includeFile = "$1$includeFile"; } } - if ($level > 1) { + if ( $level > 1 && $^V lt v5.6.0 ) { warning("Warning: Perl versions before 5.6 cannot handle nested includes"); next; } diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index b04ed6f8..df29af3d 100755 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -1895,7 +1895,7 @@ sub Parse_Config { $includeFile = "$1$includeFile"; } } - if ( $level > 1 ) { + if ( $level > 1 && $^V lt v5.6.0 ) { warning( "Warning: Perl versions before 5.6 cannot handle nested includes" );