#
# http://www.fabiankeil.de/sourcecode/privoxy-log-parser/
#
-# $Id: privoxy-log-parser.pl,v 1.127 2012/03/10 11:08:44 fabiankeil Exp $
+# $Id: privoxy-log-parser.pl,v 1.132 2012/07/23 12:40:08 fabiankeil Exp $
#
# TODO:
# - LOG_LEVEL_CGI, LOG_LEVEL_ERROR, LOG_LEVEL_WRITE content highlighting
# XXX: The Rolling Stones reference has to go.
###############################################################
- my $colour = shift @_;
+ my $colour = shift;
return "" if cli_option_is_set('no-syntax-highlighting');
# Takes a string and returns a span element
###############################################################
- my $type = shift @_;
+ my $type = shift;
my $code;
if ($type =~ /Standard/) {
# markup should always be semantically correct.
###############################################################
- my $type = shift @_;
+ my $type = shift;
my $code;
if ($type =~ /Standard/) {
my $message = shift;
if (LOG_UNPARSED_LINES_TO_EXTRA_FILE) {
- open(my $errorlog_fd, ">>" . ERROR_LOG_FILE) || die "Writing " . ERROR_LOG_FILE . " failed";
+ open(my $errorlog_fd, ">>", ERROR_LOG_FILE) || die "Writing " . ERROR_LOG_FILE . " failed";
print $errorlog_fd $message;
close($errorlog_fd);
}
or $c =~ m/^Continue hack in da house/
or $c =~ m/^Merged multiple header lines to:/
or $c =~ m/^Added header: /
+ or $c =~ m/^Enlisting (?:sorted|left-over) header/
)
{
# XXX: Some of these may need highlighting
# Continue hack in da house.
# Merged multiple header lines to: 'X-FORWARDED-PROTO: http X-HOST: 127.0.0.1'
# Added header: Content-Encoding: deflate
+ # Enlisting sorted header User-Agent: Mozilla/5.0 (X11; SunOS i86pc; rv:10.0.3) Gecko/20100101 Firefox/10.0.3
+ # Enlisting left-over header Connection: close
} elsif ($c =~ m/^scanning headers for:/) {
$c =~ s@(?<=Timeout is: )(\d+)@$h{'Number'}$1$h{'Standard'}@;
$c =~ s@(?<=Assumed latency: )(\d+)@$h{'Number'}$1$h{'Standard'}@;
- } elsif ($c =~ m/^Stopped waiting for the request line./) {
+ } elsif ($c =~ m/^Stopped waiting for the request line/ or
+ $c =~ m/^No request line on socket \d received in time/ or
+ $c =~ m/^The client side of the connection on socket \d/) {
# Stopped waiting for the request line. Timeout: 121.
+ # Privoxy 3.0.19 and later:
+ # No request line on socket 5 received in time. Timeout: 1.
+ # The client side of the connection on socket 5 got closed \
+ # without sending a complete request line.
$c =~ s@(?<=Timeout: )(\d+)@$h{'Number'}$1$h{'Standard'}@;
+ $c =~ s@(?<=socket )(\d+)@$h{'Number'}$1$h{'Standard'}@;
} elsif ($c =~ m/^Waiting for \d/) {
sub print_non_clf_message ($) {
my $content = shift;
- my $msec_string = "." . $req{$t}{'msecs'} unless $no_msecs_mode;
+ my $msec_string = $no_msecs_mode ? '' : '.' . $req{$t}{'msecs'};
my $line_start = $html_output_mode ? '' : $h{"Standard"};
return if DEBUG_SUPPRESS_LOG_MESSAGES;