From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 21 Jul 2009 14:04:25 +0000 (+0000)
Subject: Ignore line feeds at the end of the message.
X-Git-Tag: v_3_0_14~9
X-Git-Url: http://www.privoxy.org/gitweb/?a=commitdiff_plain;h=17f6815ce5a83ba283821753c1ebf870ad10079f;p=privoxy.git

Ignore line feeds at the end of the message.
---

diff --git a/tools/privoxy-log-parser.pl b/tools/privoxy-log-parser.pl
index efece5d8..eb957632 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.160 2009/07/21 09:46:59 fk Exp fk $
+# $Id: privoxy-log-parser.pl,v 1.161 2009/07/21 13:58:53 fk Exp $
 #
 # TODO:
 #       - LOG_LEVEL_CGI, LOG_LEVEL_ERROR, LOG_LEVEL_WRITE content highlighting
@@ -1898,7 +1898,7 @@ sub parse_loop () {
  
         $output = '';
 
-        if (m/^(\w{3} \d{2}) (\d\d:\d\d:\d\d)\.?(\d+)? (?:Privoxy\()?([^\)\s]*)[\)]? ([\w -]*): (.*)$/) {
+        if (m/^(\w{3} \d{2}) (\d\d:\d\d:\d\d)\.?(\d+)? (?:Privoxy\()?([^\)\s]*)[\)]? ([\w -]*): (.*?)\r?$/) {
             # XXX: Put in req hash?
             $day = $1;
             $time_stamp = $2;