check_curl: test adaption and output adaption

3 files changed, 69 insertions, 63 deletions

diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index 17fb5564..89173808 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -238,7 +238,28 @@ mp_subcheck check_http(const check_curl_config config, check_curl_working_state
                 return sc_result;
         }
 
-        xasprintf(&sc_curl.output, "cURL performed query");
+        /* get status line of answer, check sanity of HTTP code */
+        if (curlhelp_parse_statusline(curl_state.header_buf->buf, curl_state.status_line) < 0) {
+                sc_result = mp_set_subcheck_state(sc_result, STATE_CRITICAL);
+                /* we cannot know the major/minor version here for sure as we cannot parse the first
+                 * line */
+                xasprintf(&sc_result.output, "HTTP/x.x unknown - Unparsable status line");
+                return sc_result;
+        }
+
+        curl_state.status_line_initialized = true;
+
+        size_t page_len = get_content_length(curl_state.header_buf, curl_state.body_buf);
+
+        double total_time;
+        handle_curl_option_return_code(
+                curl_easy_getinfo(curl_state.curl, CURLINFO_TOTAL_TIME, &total_time),
+                "CURLINFO_TOTAL_TIME");
+
+        xasprintf(
+                &sc_curl.output, "%s %d %s - %ld bytes in %.3f second response time",
+                string_statuscode(curl_state.status_line->http_major, curl_state.status_line->http_minor),
+                curl_state.status_line->http_code, curl_state.status_line->msg, page_len, total_time);
         sc_curl = mp_set_subcheck_state(sc_curl, STATE_OK);
         mp_add_subcheck_to_subcheck(&sc_result, sc_curl);
 
@@ -264,10 +285,6 @@ mp_subcheck check_http(const check_curl_config config, check_curl_working_state
 
         // total time the query took
         mp_perfdata pd_total_time = perfdata_init();
-        double total_time;
-        handle_curl_option_return_code(
-                curl_easy_getinfo(curl_state.curl, CURLINFO_TOTAL_TIME, &total_time),
-                "CURLINFO_TOTAL_TIME");
         mp_perfdata_value pd_val_total_time = mp_create_pd_value(total_time);
         pd_total_time.value = pd_val_total_time;
         pd_total_time = mp_pd_set_thresholds(pd_total_time, config.thlds);
@@ -360,17 +377,6 @@ mp_subcheck check_http(const check_curl_config config, check_curl_working_state
                 return sc_result;
         }
 
-        /* get status line of answer, check sanity of HTTP code */
-        if (curlhelp_parse_statusline(curl_state.header_buf->buf, curl_state.status_line) < 0) {
-                sc_result = mp_set_subcheck_state(sc_result, STATE_CRITICAL);
-                /* we cannot know the major/minor version here for sure as we cannot parse the first
-                 * line */
-                xasprintf(&sc_result.output, "HTTP/x.x unknown - Unparsable status line");
-                return sc_result;
-        }
-
-        curl_state.status_line_initialized = true;
-
         /* get result code from cURL */
         long httpReturnCode;
         handle_curl_option_return_code(
@@ -578,7 +584,6 @@ mp_subcheck check_http(const check_curl_config config, check_curl_working_state
 
         // size a.k.a. page length
         mp_perfdata pd_page_length = perfdata_init();
-        size_t page_len = get_content_length(curl_state.header_buf, curl_state.body_buf);
         mp_perfdata_value pd_val_page_length = mp_create_pd_value(page_len);
         pd_page_length.value = pd_val_page_length;
         pd_page_length.label = "size";
diff --git a/plugins/t/check_curl.t b/plugins/t/check_curl.t
index 7a930a4e..7f1a2de0 100644
--- a/plugins/t/check_curl.t
+++ b/plugins/t/check_curl.t
@@ -18,7 +18,7 @@ BEGIN {
 }
 
 
-my $successOutput = '/OK.*HTTP.*second/';
+my $successOutput = '/.*HTTP.*second/';
 
 my $res;
 my $plugin = 'check_http';
@@ -63,7 +63,7 @@ $res = NPTest->testCmd(
     );
 cmp_ok( $res->return_code, '==', 2, "Webserver $host_nonresponsive not responding" );
 # was CRITICAL only, but both check_curl and check_http print HTTP CRITICAL (puzzle?!)
-like( $res->output, "/HTTP CRITICAL - Invalid HTTP response received from host on port 80: cURL returned 28 - Connection timed out after/", "Output OK");
+like( $res->output, "/Invalid HTTP response received from host on port 80: cURL returned 28 - Connection timed out after/", "Output OK");
 
 $res = NPTest->testCmd(
     "./$plugin $hostname_invalid -wt 1 -ct 2"
diff --git a/plugins/tests/check_curl.t b/plugins/tests/check_curl.t
index eaa9f518..e66d0ba6 100755
--- a/plugins/tests/check_curl.t
+++ b/plugins/tests/check_curl.t
@@ -15,6 +15,7 @@
 # Email Address []:devel@monitoring-plugins.org
 
 use strict;
+use warnings;
 use Test::More;
 use NPTest;
 use FindBin qw($Bin);
@@ -245,21 +246,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 $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  2 12:00:00 2008 +0000.*/',
                 "output ok" );
 
 }
@@ -274,19 +275,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
@@ -296,19 +297,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 );
 }
 
 
@@ -321,165 +322,165 @@ 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 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 );
 
         # These tests may block
         # stickyport - on full urlS port is set back to 80 otherwise