Merge pull request #2749 from martinhsv/v2/master

mlogc log-line parsing fails due to enhanced timestamp

Author: martinhsv

CHANGES

@@ -1,6 +1,8 @@
 DD mmm YYYY - 2.9.x (to be released)
 -------------------
 
+ * mlogc log-line parsing fails due to enhanced timestamp
+   [Issue #2682 - @bozhinov, @ABrauer-CPT, @martinhsv]
  * Allow no-key, single-value JSON body
    [Issue #2735 - @marcstern, @martinhsv]
  * Set SecStatusEngine Off in modsecurity.conf-recommended

mlogc/mlogc.c

@@ -96,7 +96,7 @@ do { \
 static const char logline_pattern[] =
     "^(\\S+)"
     "\\ (\\S+)\\ (\\S+)\\ (\\S+)"
-    "\\ \\[([^:]+):(\\d+:\\d+:\\d+)\\ ([^\\]]+)\\]"
+    "\\ \\[([^:]+):(\\d+:\\d+:\\d+(?:[.]\\d+)?)\\ ([^\\]]+)\\]"
     "\\ \"(.*)\""
     "\\ (\\d+)\\ (\\S+)"
     "\\ \"(.*)\"\\ \"(.*)\""