From: eldy <>
Date: Mon, 25 Feb 2002 03:02:31 +0000 (+0000)
Subject: no message
X-Git-Tag: AWSTATS_4_0_BETA~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6028424596244c45db69923d02aa44a9d7930e4c;p=thirdparty%2FAWStats.git

no message
---

diff --git a/tools/common2combined.pl b/tools/common2combined.pl
index b7800721..7e733854 100644
--- a/tools/common2combined.pl
+++ b/tools/common2combined.pl
@@ -10,7 +10,7 @@
 # See COPYING.TXT file about AWStats GNU General Public License.
 #-------------------------------------------------------
 use strict; no strict "refs";
-use diagnostics;
+#use diagnostics;
 
 
 #-------------------------------------------------------
@@ -30,6 +30,8 @@ my $DirData="";
 my $NbOfLinesForBenchmark=5000;
 my $NewReferer="-";		#$NewReferer="http://www.referersite.com/refererpage.html";
 my $NewUserAgent="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)";
+my $nowtime = my $nowweekofmonth = my $nowdaymod = my $nowsmallyear = 0; 
+my $nowsec = my $nowmin = my $nowhour = my $nowday = my $nowmonth = my $nowyear = my $nowwday = 0;
 # ---------- Init hash arrays --------
 my %ParamFile=();
 my %linerecord=();
diff --git a/tools/logresolvemerge.pl b/tools/logresolvemerge.pl
index 9fba6a84..72056c5e 100644
--- a/tools/logresolvemerge.pl
+++ b/tools/logresolvemerge.pl
@@ -11,7 +11,7 @@
 # See COPYING.TXT file about AWStats GNU General Public License.
 #-------------------------------------------------------
 use strict; no strict "refs";
-use diagnostics;
+#use diagnostics;
 #use Thread;
 
 
@@ -29,9 +29,11 @@ my $Extension;
 my $DNSLookup=0;
 my $DirCgi="";
 my $DirData="";
+my $DNSLookupAlreadyDone=0;
 my $QueuePoolSize=10;
 my $NbOfLinesForBenchmark=5000;
-my $DNSLookupAlreadyDone=0;
+my $nowtime = my $nowweekofmonth = my $nowdaymod = my $nowsmallyear = 0; 
+my $nowsec = my $nowmin = my $nowhour = my $nowday = my $nowmonth = my $nowyear = my $nowwday = 0;
 # ---------- Init arrays --------
 my @SkipDNSLookupFor=();
 # ---------- Init hash arrays --------