Changeset 326

Timestamp:

Apr 6, 2011, 2:31:24 PM (14 years ago)

Author:

katerina

Message:

Fix for ticket #246: Add method to specify user-defined regex in APACHE log format

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_log_parse_apache.c (modified) (2 diffs)

trunk/docs/Changelog

@@ +1 @@
+2.8.4:
+        * Fix potential timeout problem in sh_sub_stat_int() and propagate the
+          error (issue reported by mtg)
+        * Add support for X-Forwarded-For in apache logfile parser, add
+          option 'RE{regex}' to insert arbitrary regex
+
 2.8.3a:
         * Fix two 'label at end of compound statement' errors on FreeBSD

trunk/src/sh_log_parse_apache.c

@@ -152 +152 @@
         {
           if(strcmp(token, "%r") == 0 || 
-             strstr(token, _("{Referer}")) == 0 || 
-             strstr(token, _("{User-Agent}")) == 0)
+             strstr(token, _("{Referer}")) != NULL || 
+             strstr(token, _("{User-Agent}")) != NULL ||
+             strstr(token, _("{X-Forwarded-For}")) != NULL )
             {
               /*
@@ -175 +176 @@
             }
         }
+      else if (token[0] == 'R' && token[1] == 'E' && token[2] == '{' && token[strlen(token)-1] == '}') 
+        {
+          char * lb =  strchr(token, '{');
+          char * rb = strrchr(token, '}');
+
+          if (lb && rb)
+            {
+              ++lb; *rb = '\0';
+              sh_string_add_from_char(re_string, lb);
+            }
+        }
       else if (token[0] == '%' && token[strlen(token)-1] == 't') 
         {