~ubuntu-branches/ubuntu/intrepid/awstats/intrepid-security

Index: awstats-6.5+dfsg/tools/logresolvemerge.pl

===================================================================

--- awstats-6.5+dfsg.orig/tools/logresolvemerge.pl      2007-02-06 14:00:41.000000000 -0800

+++ awstats-6.5+dfsg/tools/logresolvemerge.pl   2007-02-06 14:05:39.000000000 -0800

@@ -518,8 +518,10 @@

                        # Split DD/Month/YYYY:HH:MM:SS or YYYY-MM-DD HH:MM:SS or MM/DD/YY\tHH:MM:SS

                        my $year=0; my $month=0; my $day=0; my $hour=0; my $minute=0; my $second=0;

                        if ($_ =~ /(\d\d\d\d)-(\d\d)-(\d\d)\s(\d\d):(\d\d):(\d\d)/) { $year=$1; $month=$2; $day=$3; $hour=$4; $minute=$5; $second=$6; }

-                       elsif ($_ =~ /\[(\d\d)[\/:\s](\w+)[\/:\s](\d\d\d\d)[\/:\s](\d\d)[\/:\s](\d\d)[\/:\s](\d\d) /) { $year=$3; $month=$2; $day=$1; $hour=$4; $minute=$5; $second=$6; }

-                       elsif ($_ =~ /\[\w+ (\w+) (\d\d) (\d\d)[\/:\s](\d\d)[\/:\s](\d\d) (\d\d\d\d)\]/) { $year=$6; $month=$1; $day=$2; $hour=$3; $minute=$4; $second=$5; }

+                       elsif ($_ =~ /\[(\d?\d)[\/:\s](\w+)[\/:\s](\d\d\d\d)[\/:\s](\d\d)[\/:\s](\d\d)[\/:\s](\d\d) /) { $year=$3; $month=$2; $day=$1; $hour=$4; $minute=$5; $second=$6; }

+                       elsif ($_ =~ /\[\w+ (\w+) (\d?\d) (\d\d)[\/:\s](\d\d)[\/:\s](\d\d) (\d\d\d\d)\]/) { $year=$6; $month=$1; $day=$2; $hour=$3; $minute=$4; $second=$5; }

+

+                       if (length $day == 1) { $day = "0".$day; }

 

                        if ($monthnum{$month}) { $month=$monthnum{$month}; }    # Change lib month in num month if necessary