1 files changed, 236 insertions, 47 deletions

diff --git a/plugins/tests/check_curl.t b/plugins/tests/check_curl.t
index 3c914830..248eb4c5 100755
--- a/plugins/tests/check_curl.t
+++ b/plugins/tests/check_curl.t
@@ -15,13 +15,19 @@
 # Email Address []:devel@monitoring-plugins.org
 
 use strict;
+use warnings;
 use Test::More;
 use NPTest;
 use FindBin qw($Bin);
 
+use URI;
+use URI::QueryParam;
+use HTTP::Daemon;
+use HTTP::Daemon::SSL;
+
 $ENV{'LC_TIME'} = "C";
 
-my $common_tests = 73;
+my $common_tests = 95;
 my $ssl_only_tests = 8;
 # Check that all dependent modules are available
 eval "use HTTP::Daemon 6.01;";
@@ -178,8 +184,130 @@ sub run_server {
                                 $c->send_basic_header;
                                 $c->send_crlf;
                                 $c->send_response(HTTP::Response->new( 200, 'OK', undef, 'redirected' ));
+                        } elsif ($r->url->path eq "/redirect_rel") {
+                                $c->send_basic_header(302);
+                                $c->send_header("Location", "/redirect2" );
+                                $c->send_crlf;
+                                $c->send_response('moved to /redirect2');
                         } elsif ($r->url->path eq "/redir_timeout") {
                                 $c->send_redirect( "/timeout" );
+            } elsif ($r->url->path =~ m{^/redirect_with_increment}) {
+                                # <scheme>://<username>:<password>@<host>:<port>/<path>;<parameters>?<query>#<fragment>
+                                # Find every parameter, query , and fragment keys and increment them
+
+                                my $content = "";
+
+                # Use URI to help with query/fragment; parse path params manually.
+                my $original_url = $r->url->as_string;
+                                $content .= " original_url: ${original_url}\n";
+                my $uri = URI->new($original_url);
+                                $content .= " uri: ${uri}\n";
+
+                                my $path = $uri->path // '';
+                                my $query = $uri->query // '';
+                                my $fragment = $uri->fragment // '';
+
+                                $content .= " path: ${path}\n";
+                                $content .= " query: ${query}\n";
+                                $content .= " fragment: ${fragment}\n";
+
+                # split the URI part and parameters. URI package cannot do this
+                # group 1 is captured: anything without a semicolon: ([^;]*)
+                # group 2 is uncaptured: (?:;(.*))?
+                # (?: ... )? prevents capturing the parameter section
+                                # inside group 2, ';' matches the first ever semicolon
+                                # group3 is captured: any character string : (.*)
+                                # \? matches an actual ? mark, which starts the query parameters
+                my ($before_params, $params) = $uri =~ m{^([^;]*)(?:;(.*))?\?};
+                                $before_params //= '';
+                                $params //= '';
+                                $content .= " before_params: ${before_params}\n";
+                                $content .= " params: ${params}\n";
+                my @parameter_pairs;
+                if (defined $params && length $params) {
+                    for my $p (split /;/, $params) {
+                        my ($key,$value) = split /=/, $p, 2;
+                        $value //= '';
+                        push @parameter_pairs, [ $key, $value ];
+                                                $content .= " parameter: ${key} -> ${value}\n";
+                    }
+                }
+
+                # query parameters are offered directly from the library
+                my @query_form = $uri->query_form;
+                my @query_parameter_pairs;
+                while (@query_form) {
+                    my $key = shift @query_form;
+                    my $value = shift @query_form;
+                                        $value //= ''; # there can be valueless keys
+                    push @query_parameter_pairs, [ $key, $value ];
+                                        $content .= " query: ${key} -> ${value}\n";
+                }
+
+                # helper to increment value
+                my $increment = sub {
+                    my ($v) = @_;
+                    return $v if !defined $v || $v eq '';
+                    # numeric integer
+                    if ($v =~ /^-?\d+$/) {
+                        return $v + 1;
+                    }
+                    # otherwise -> increment as if its an ascii character
+                                        # sed replacement syntax, but the $& holds the matched character
+                    if (length($v)) {
+                        (my $new_v = $v) =~ s/./chr(ord($&) + 1)/ge;
+                                        return $new_v;
+                    }
+                };
+
+                # increment values in pairs
+                for my $pair (@parameter_pairs) {
+                    $pair->[1] = $increment->($pair->[1]);
+                                        $content .= " parameter new: " . $pair->[0] . " -> " . $pair->[1] . "\n";
+                }
+                for my $pair (@query_parameter_pairs) {
+                    $pair->[1] = $increment->($pair->[1]);
+                                        $content .= " query parameter new: " . $pair->[0] . " -> " . $pair->[1] . "\n";
+                }
+
+                # rebuild strings
+                my $new_parameter_str = join(';', map { $_->[0] . '=' . $_->[1] } @parameter_pairs);
+                                $content .= " new_parameter_str: ${new_parameter_str}\n";
+
+                                # library can rebuild from an array
+                my @new_query_form;
+                for my $p (@query_parameter_pairs) { push @new_query_form, $p->[0], $p->[1] }
+
+                                my $new_fragment_str = '';
+                                for my $pair (@parameter_pairs) {
+                                        my $key = $pair->[0];
+                                        my $value = $pair->[1];
+                                        if ($key eq "fragment") {
+                                                $new_fragment_str = $value
+                                        }
+                }
+                                $content .= " new_fragment_str: ${new_fragment_str}\n";
+
+                # construct new URI using the library
+                my $new_uri = URI->new('');
+                $new_uri->path( $before_params . ($new_parameter_str ? ';' . $new_parameter_str : '') );
+                $new_uri->query_form( \@new_query_form ) if @new_query_form;
+                $new_uri->fragment( $new_fragment_str ) if $new_fragment_str ne '';
+                                $content .= " new_uri: ${new_uri}\n";
+
+                                # Redirect until fail_count or redirect_count reaches 3
+                                if ($new_uri =~ /fail_count=3/){
+                                        $c->send_error(HTTP::Status->RC_FORBIDDEN, "fail count reached 3, url path:" . $r->url->path );
+                                } elsif ($new_uri =~ /redirect_count=3/){
+                                        $c->send_response(HTTP::Response->new( 200, 'OK', undef , $content ));
+                                } elsif ($new_uri =~ /location_redirect_count=3/){
+                                        $c->send_basic_header(302);
+                                        $c->send_header("Location", "$new_uri" );
+                                        $c->send_crlf;
+                                        $c->send_response("$content \n moved to $new_uri");
+                                } else {
+                        $c->send_redirect( $new_uri->as_string, 301, $content );
+                                }
                         } elsif ($r->url->path eq "/timeout") {
                                 # Keep $c from being destroyed, but prevent severe leaks
                                 unshift @persist, $c;
@@ -209,7 +337,7 @@ sub run_server {
                                         return($chunk);
                                 }));
                         } else {
-                                $c->send_error(HTTP::Status->RC_FORBIDDEN);
+                                $c->send_error(HTTP::Status->RC_FORBIDDEN, "unknown url path:" . $r->url->path );
                         }
                         $c->close;
                 }
@@ -240,21 +368,21 @@ SKIP: {
 
         $result = NPTest->testCmd( "$command -p $port_https -S -C 14" );
         is( $result->return_code, 0, "$command -p $port_https -S -C 14" );
-        is( $result->output, "OK - Certificate 'Monitoring Plugins' will expire on $expiry.", "output ok" );
+        like( $result->output, '/.*Certificate \'Monitoring Plugins\' will expire on ' . quotemeta($expiry) . '.*/', "output ok" );
 
         $result = NPTest->testCmd( "$command -p $port_https -S -C 14000" );
         is( $result->return_code, 1, "$command -p $port_https -S -C 14000" );
-        like( $result->output, '/WARNING - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\)./', "output ok" );
+        like( $result->output, '/.*Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\).*/', "output ok" );
 
         # Expired cert tests
         $result = NPTest->testCmd( "$command -p $port_https -S -C 13960,14000" );
         is( $result->return_code, 2, "$command -p $port_https -S -C 13960,14000" );
-        like( $result->output, '/CRITICAL - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\)./', "output ok" );
+        like( $result->output, '/.*Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\).*/', "output ok" );
 
         $result = NPTest->testCmd( "$command -p $port_https_expired -S -C 7" );
         is( $result->return_code, 2, "$command -p $port_https_expired -S -C 7" );
-        is( $result->output,
-                'CRITICAL - Certificate \'Monitoring Plugins\' expired on Wed Jan  2 12:00:00 2008 +0000.',
+        like( $result->output,
+                '/.*Certificate \'Monitoring Plugins\' expired on Wed Jan\s+2 12:00:00 2008 \+0000.*/',
                 "output ok" );
 
 }
@@ -269,19 +397,19 @@ SKIP: {
         $cmd = "./$plugin -H $virtual_host -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host:$port_http\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # http with virtual port (!= 80)
         $cmd = "./$plugin -H $virtual_host:$virtual_port -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host:$virtual_port\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # http with virtual port (80)
         $cmd = "./$plugin -H $virtual_host:80 -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 }
 
 # and the same for SSL
@@ -291,19 +419,19 @@ SKIP: {
         $cmd = "./$plugin -H $virtual_host -I 127.0.0.1 -p $port_https --ssl -u /virtual_port -r ^$virtual_host:$port_https\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # https with virtual port (!= 443)
         $cmd = "./$plugin -H $virtual_host:$virtual_port -I 127.0.0.1 -p $port_https --ssl -u /virtual_port -r ^$virtual_host:$virtual_port\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # https with virtual port (443)
         $cmd = "./$plugin -H $virtual_host:443 -I 127.0.0.1 -p $port_https --ssl -u /virtual_port -r ^$virtual_host\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 }
 
 
@@ -316,164 +444,225 @@ sub run_common_tests {
 
         $result = NPTest->testCmd( "$command -u /file/root" );
         is( $result->return_code, 0, "/file/root");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second.*/', "Output correct" );
 
         $result = NPTest->testCmd( "$command -u /file/root -s Root" );
         is( $result->return_code, 0, "/file/root search for string");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second.*/', "Output correct" );
 
         $result = NPTest->testCmd( "$command -u /file/root -s NonRoot" );
         is( $result->return_code, 2, "Missing string check");
-        like( $result->output, qr%^HTTP CRITICAL: HTTP/1\.1 200 OK - string 'NonRoot' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
+        like( $result->output, qr%string 'NonRoot' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
 
         $result = NPTest->testCmd( "$command -u /file/root -s NonRootWithOver30charsAndMoreFunThanAWetFish" );
         is( $result->return_code, 2, "Missing string check");
-        like( $result->output, qr%HTTP CRITICAL: HTTP/1\.1 200 OK - string 'NonRootWithOver30charsAndM...' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
+        like( $result->output, qr%string 'NonRootWithOver30charsAndM...' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
 
         $result = NPTest->testCmd( "$command -u /header_check -d foo" );
         is( $result->return_code, 0, "header_check search for string");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 96 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 96 bytes in [\d\.]+ second.*/', "Output correct" );
 
         $result = NPTest->testCmd( "$command -u /header_check -d bar" );
         is( $result->return_code, 2, "Missing header string check");
-        like( $result->output, qr%^HTTP CRITICAL: HTTP/1\.1 200 OK - header 'bar' not found on 'https?://127\.0\.0\.1:\d+/header_check'%, "Shows search string and location");
+        like( $result->output, qr%header 'bar' not found on 'https?://127\.0\.0\.1:\d+/header_check'%, "Shows search string and location");
 
         $result = NPTest->testCmd( "$command -u /header_broken_check" );
         is( $result->return_code, 0, "header_check search for string");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 138 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 138 bytes in [\d\.]+ second.*/', "Output correct" );
 
         my $cmd;
         $cmd = "$command -u /slow";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, "$cmd");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
         $result->output =~ /in ([\d\.]+) second/;
         cmp_ok( $1, ">", 1, "Time is > 1 second" );
 
         $cmd = "$command -u /statuscode/200";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/200 -e 200";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - Status line output matched "200" - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "200".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 201 Created - \d+ bytes in [\d\.]+ second /', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 201 Created - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201 -e 201";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 201 Created - Status line output matched "201" - \d+ bytes in [\d\.]+ second /', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "201".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201 -e 200";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 2, $cmd);
-        like( $result->output, '/^HTTP CRITICAL - Invalid HTTP response received from host on port \d+: HTTP/1.1 201 Created/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Invalid HTTP response received from host on port \d+: HTTP/1.1 201 Created.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/200 -e 200,201,202";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - Status line output matched "200,201,202" - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "200,201,202".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201 -e 200,201,202";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 201 Created - Status line output matched "200,201,202" - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "200,201,202".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/203 -e 200,201,202";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 2, $cmd);
-        like( $result->output, '/^HTTP CRITICAL - Invalid HTTP response received from host on port (\d+): HTTP/1.1 203 Non-Authoritative Information/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Invalid HTTP response received from host on port (\d+): HTTP/1.1 203 Non-Authoritative Information.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j HEAD -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 HEAD - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 HEAD - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j POST -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j GET -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -P foo -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j DELETE -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 1, $cmd);
-        like( $result->output, '/^HTTP WARNING: HTTP/1.1 405 Method Not Allowed/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 405 Method Not Allowed.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j foo -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 2, $cmd);
-        like( $result->output, '/^HTTP CRITICAL: HTTP/1.1 501 Not Implemented/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 501 Not Implemented.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -P stufftoinclude -u /postdata -s POST:stufftoinclude";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j PUT -P stufftoinclude -u /postdata -s PUT:stufftoinclude";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # To confirm that the free doesn't segfault
         $cmd = "$command -P stufftoinclude -j PUT -u /postdata -s PUT:stufftoinclude";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /redirect";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f follow -u /redirect";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f follow -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f sticky -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f stickyport -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
+
+        $cmd = "$command -f follow -u /redirect_rel -s redirected";
+        $result = NPTest->testCmd( $cmd );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
+
+        # Redirect with increment tests. These are for checking if the url parameters, query parameters and fragment are parsed.
+        # The server at this point has dynamic redirection. It tries to increment values that it sees in these fields, then redirects.
+        # It also appends some debug log and writes it into HTTP content, pass the -vvv parameter to see them.
+
+        $cmd = "$command -u '/redirect_with_increment/path1/path2/path3/path4' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 1, $cmd);
+        like( $result->output, '/.*HTTP/1.1 403 Forbidden - \d+ bytes in [\d\.]+ second.*/', "Output correct, redirect_count was not present, got redirected to / : ".$result->output );
+
+        # redirect_count=0 is parsed as a parameter and incremented. When it goes up to 3, the redirection returns HTTP OK
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, redirect_count went up to 3, and returned OK: ".$result->output );
+
+        # location_redirect_count=0 goes up to 3, which uses the HTTP 302 style of redirection with 'Location' header
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;location_redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
 
-  # These tests may block
-        print "ALRM\n";
+        # fail_count parameter may also go up to 3, which returns a HTTP 403
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;fail_count=2' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 1, $cmd);
+        like( $result->output, '/.*HTTP/1.1 403 Forbidden - \d+ bytes in [\d\.]+ second.*/', "Output correct, early due to fail_count reaching 3: ".$result->output );
+
+        # redirect_count=0, p1=1 , p2=ab => redirect_count=1, p1=2 , p2=bc => redirect_count=2, p1=3 , p2=cd => redirect_count=3 , p1=4 , p2=de
+        # Last visited URI returns HTTP OK instead of redirect, and the one before that contains the new_uri in its content
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*redirect_count=3;p1=4;p2=de\?*/', "Output correct, parsed and incremented both parameters p1 and p2 : ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
+
+        # Same incrementation as before, uses the query parameters that come after the first '?' : qp1 and qp2
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*\?qp1=13&qp2=no*/', "Output correct, parsed and incremented both query parameters qp1 and qp2 : ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
+
+        # Check if the query parameter order is kept intact
+        $cmd = "$command -u '/redirect_with_increment;redirect_count=0;?qp0=0&qp1=1&qp2=2&qp3=3&qp4=4&qp5=5' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*\?qp0=3&qp1=4&qp2=5&qp3=6&qp4=7&qp5=8*/', "Output correct, parsed and incremented query parameters qp1,qp2,qp3,qp4,qp5 in order : ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
+
+        # The fragment is passed as another parameter.
+        # During the server redirects the fragment will be set to its value, if such a key is present.
+        # 'ebiil' => 'fcjjm' => 'gdkkn' => 'hello'
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;fragment=ebiil?qp1=0' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*redirect_count=3;fragment=hello\?qp1=3#hello*/', "Output correct, fragments are specified by server and followed by check_curl: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
 
+        # These tests may block
         # stickyport - on full urlS port is set back to 80 otherwise
         $cmd = "$command -f stickyport -u /redir_external -t 5 -s redirected";
         eval {