Add read_socks_reply() and start using it in socks5_connect()

[privoxy.git] / tools / privoxy-log-parser.pl

diff --git a/tools/privoxy-log-parser.pl b/tools/privoxy-log-parser.pl
index 66f6ac4..0b0a4dc 100755 (executable)
--- a/tools/privoxy-log-parser.pl
+++ b/tools/privoxy-log-parser.pl
@@ -23,7 +23,7 @@
 #         hash key as input.
 #       - Add --compress and --decompress options.
 #
 #         hash key as input.
 #       - Add --compress and --decompress options.
 #

-# Copyright (c) 2007-2021 Fabian Keil <fk@fabiankeil.de>
+# Copyright (c) 2007-2022 Fabian Keil <fk@fabiankeil.de>

 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above


@@ -1645,7 +1645,7 @@ sub handle_loglevel_connect($) {
         $c =~ s@(?<=Assumed latency: )(\d+)@$h{'Number'}$1$h{'Standard'}@;
 
     } elsif ($c =~ m/^Stopped waiting for the request line/ or
         $c =~ s@(?<=Assumed latency: )(\d+)@$h{'Number'}$1$h{'Standard'}@;
 
     } elsif ($c =~ m/^Stopped waiting for the request line/ or

-             $c =~ m/^No request line on socket \d received in time/ 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.
              $c =~ m/^The client side of the connection on socket \d/) {
 
         # Stopped waiting for the request line. Timeout: 121.


@@ -2748,7 +2748,7 @@ sub stats_loop() {
 
 }
 
 
 }
 

-# Convert a timestamp like 18:07:28.733 into miliseconds
+# Convert a timestamp like 18:07:28.733 into milliseconds

 sub time_stamp_to_msecs($) {
     my $time_stamp = shift;
 
 sub time_stamp_to_msecs($) {
     my $time_stamp = shift;
 


@@ -2780,7 +2780,7 @@ sub inactivity_detection_loop() {
         next if ($time_stamp eq "-");
         $msecs = time_stamp_to_msecs($time_stamp);
         unless (defined $msecs) {
         next if ($time_stamp eq "-");
         $msecs = time_stamp_to_msecs($time_stamp);
         unless (defined $msecs) {

-            print "Failed to convert $time_stamp into miliseconds\n";
+            print "Failed to convert $time_stamp into milliseconds\n";

             print "$_";
             next;
         }
             print "$_";
             next;
         }


@@ -2992,7 +2992,7 @@ will hide the "filter foo caused 0 hits" message.
 =head1 OPTIONS
 
 [B<--detect-inactivity>] Instead of syntax highlighting, detect periods
 =head1 OPTIONS
 
 [B<--detect-inactivity>] Instead of syntax highlighting, detect periods

-of log inactivity of more than the amount of miliseconds specified with
+of log inactivity of more than the amount of milliseconds specified with

 the B<--inactivity-threshold> option. Mainly useful for debugging.
 
 [B<--host-statistics-threshold>] Only show the request count for a host
 the B<--inactivity-threshold> option. Mainly useful for debugging.
 
 [B<--host-statistics-threshold>] Only show the request count for a host


@@ -3004,7 +3004,7 @@ omitted, ANSI escape sequences are used unless B<--no-syntax-highlighting> is ac
 This option is only intended to make embedding log excerpts in web pages easier.
 It does not escape any input!
 
 This option is only intended to make embedding log excerpts in web pages easier.
 It does not escape any input!
 

-[B<--inactivity-threshold msecs>] Specifies the number of miliseconds between
+[B<--inactivity-threshold msecs>] Specifies the number of milliseconds between

 log messages to consider inactivity when running in [B<--detect-inactivity>]
 mode.
 
 log messages to consider inactivity when running in [B<--detect-inactivity>]
 mode.