Fixed a bug of vampired memory and abnormal disk swapping when using logresolvemerge.pl

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index f5346ce9cecf66e098d076f77d4d33c1372ba5a1..c4b08ee9960646acb50bc16b858f33d85ad2d74a 100644 (file)
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -3,8 +3,16 @@ AWStats Changelog
 
 4.1
 
+- Fixed a bug of vampired memory and abnormal disk swapping when using
+  logresolvemerge.pl
 - New feature: Report exit pages
 - New feature: Report visits duration
+- New option: Added -dir option to choose destination directory 
+  for awstats_buildstaticpages.pl
+- Updated AWStats databases
+- Updated documentation
+
+
 
 
 4.0

diff --git a/tools/logresolvemerge.pl b/tools/logresolvemerge.pl
index 070ca30dd5c9d93f87811fb9b94274e00481d7d1..a4e89348356b8e920ffe45e16864660194049919 100644 (file)
--- a/tools/logresolvemerge.pl
+++ b/tools/logresolvemerge.pl
@@ -21,7 +21,7 @@ use strict; no strict "refs";
 # Defines
 #-------------------------------------------------------
 my $REVISION='$Revision$'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
-my $VERSION="1.1 (build $REVISION)";
+my $VERSION="1.2 (build $REVISION)";
 
 # ---------- Init variables --------
 my $Debug=0;