From 0dc5c4227c2560f5f758c00ff70b6d197deaa54f Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 3 May 2011 10:12:23 +0000
Subject: [PATCH] In unbreak_lines_only_loop(), accept ISO 8601 time stamps,
 too

---
 tools/privoxy-log-parser.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/privoxy-log-parser.pl b/tools/privoxy-log-parser.pl
index efcd796e..5d564000 100755
--- a/tools/privoxy-log-parser.pl
+++ b/tools/privoxy-log-parser.pl
@@ -8,7 +8,7 @@
 #
 # http://www.fabiankeil.de/sourcecode/privoxy-log-parser/
 #
-# $Id: privoxy-log-parser.pl,v 1.113 2011/04/19 13:08:51 fabiankeil Exp $
+# $Id: privoxy-log-parser.pl,v 1.114 2011/04/19 13:10:11 fabiankeil Exp $
 #
 # TODO:
 #       - LOG_LEVEL_CGI, LOG_LEVEL_ERROR, LOG_LEVEL_WRITE content highlighting
@@ -2302,17 +2302,20 @@ sub unbreak_lines_only_loop() {
             # Log level other than LOG_LEVEL_CLF?
         if (m/^(\d{4}-\d{2}-\d{2}|\w{3} \d{2}) (\d\d:\d\d:\d\d)\.?(\d+)? (?:Privoxy\()?([^\)\s]*)[\)]? ([\w -]*): (.*?)\r?$/ or
             # LOG_LEVEL_CLF?
-            m/^((?:\d+\.\d+\.\d+\.\d+|[:\d]+)) - - \[(.*)\] "(.*)" (\d+) (\d+)/) {
+            m/^((?:\d+\.\d+\.\d+\.\d+)) - - \[(.*)\] "(.*)" (\d+) (\d+)/) {
             $log_messages_reached = 1;
             print "\n";
 
         } else {
             # Wrapped message
+            $_ = "\n". $_  if /^(?:\d+\.\d+\.\d+\.\d+)/;
+            $_ = " " . $_;
         }
         s@<BR>$@@;
         print;
         print "\n" unless $log_messages_reached;
     }
+    print "\n";
 }
 
 sub VersionMessage {
-- 
2.39.2