Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Sep 21, 2014
1 parent 6a724b5 commit 31076c1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions docs/awstats_changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Fixes:
- #921 Failure in the help text for geoip_generator.pl
- #909 awstats_buildstaticpages.pl noisy debug output.
- #680 Invalid data passed to Time::Local causes global destruction.
- #212 Fix CVE-2006-2237


***** 7.3 *****
Expand Down
6 changes: 3 additions & 3 deletions wwwroot/cgi-bin/awstats.pl
Original file line number Diff line number Diff line change
Expand Up @@ -1322,7 +1322,7 @@ sub debug {
if ( $level <= $DEBUGFORCED ) {
my $debugstring = $_[0];
if ( !$DebugResetDone ) {
open( DEBUGFORCEDFILE, "debug.log" );
open( DEBUGFORCEDFILE, "<debug.log" );
close DEBUGFORCEDFILE;
chmod 0666, "debug.log";
$DebugResetDone = 1;
Expand Down Expand Up @@ -1745,7 +1745,7 @@ sub Read_Config {
my $searchdir = $_;
if ( $searchdir && $searchdir !~ /[\\\/]$/ ) { $searchdir .= "/"; }

if ( -f $searchdir.$PROG.".".$SiteConfig.".conf" && open( CONFIG, "$searchdir$PROG.$SiteConfig.conf" ) ) {
if ( -f $searchdir.$PROG.".".$SiteConfig.".conf" && open( CONFIG, "<$searchdir$PROG.$SiteConfig.conf" ) ) {
$FileConfig = "$searchdir$PROG.$SiteConfig.conf";
$FileSuffix = ".$SiteConfig";
if ($Debug){debug("Opened config: $searchdir$PROG.$SiteConfig.conf", 2);}
Expand Down Expand Up @@ -1890,7 +1890,7 @@ sub Parse_Config {
next;
}
local( *CONFIG_INCLUDE ); # To avoid having parent file closed when include file is closed
if ( open( CONFIG_INCLUDE, $includeFile ) ) {
if ( open( CONFIG_INCLUDE, "<$includeFile" ) ) {
&Parse_Config( *CONFIG_INCLUDE, $level + 1, $includeFile );
close(CONFIG_INCLUDE);
}
Expand Down

0 comments on commit 31076c1

Please sign in to comment.