Bug#303480: awstats: Recognition of common logtype if set to combined.

[Korbinian Rosenegger]

Package: awstats
Version: 6.4-1
Severity: wishlist
Tags: patch


A small change to the regexp of the combined log type would make it also 
recognize the common log format of apache.



-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.4.28-grsec
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)

Versions of packages awstats depends on:
ii  perl [libstorable-perl]       5.8.4-8    Larry Wall's Practical Extraction 

-- no debconf information

--- awstats.pl-6.4      2005-04-07 00:31:47.000000000 +0200
+++ awstats.pl  2005-04-07 00:32:07.000000000 +0200
@@ -4903,7 +4903,7 @@
                if ($LogFormat eq '1' || $LogFormat eq '6') {   # Same than "%h 
%l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"".
                        # %u (user) is "([^\\[]+)" instead of "[^ ]+" because 
can contain space (Lotus Notes). referer and ua might be "".
 #                      $PerlParsingFormat="([^ ]+) [^ ]+ ([^\\[]+) \\[([^ ]+) 
[^ ]+\\] \\\"([^ ]+) (.+) [^\\\"]+\\\" ([\\d|-]+) ([\\d|-]+) \\\"(.*?)\\\" 
\\\"([^\\\"]*)\\\"";
-                       $PerlParsingFormat="([^ ]+) [^ ]+ ([^\\[]+) \\[([^ ]+) 
[^ ]+\\] \\\"([^ ]+) ([^ ]+) [^\\\"]+\\\" ([\\d|-]+) ([\\d|-]+) \\\"(.*?)\\\" 
\\\"([^\\\"]*)\\\"";
+                       $PerlParsingFormat="([^ ]+) [^ ]+ ([^\\[]+) \\[([^ ]+) 
[^ ]+\\] \\\"([^ ]+) ([^ ]+) [^\\\"]+\\\" ([\\d|-]+) ([\\d|-]+)(?: 
\\\"(.*?)\\\" \\\"([^\\\"]*)\\\")?";
                        
$pos_host=0;$pos_logname=1;$pos_date=2;$pos_method=3;$pos_url=4;$pos_code=5;$pos_size=6;$pos_referer=7;$pos_agent=8;
                        
@fieldlib=('host','logname','date','method','url','code','size','referer','ua');
                }