summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2007-02-14 10:11:07 +0000
committerTon Voon <tonvoon@users.sourceforge.net>2007-02-14 10:11:07 +0000
commit7106d10ab26d43c1ae1ff4d55397c38147222b51 (patch)
tree263262d4c6ecc690070bf137c8e8b81f557dde0e
parent098d3be6a8c89b08cacc73f2eb0fb292eb2f2e96 (diff)
downloadmonitoring-plugins-7106d10ab26d43c1ae1ff4d55397c38147222b51.tar.gz
Documentation fix re: --escape flag. Fix of ./check_tcp test to webservers
to make it more standards compliant git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1620 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--plugins/check_tcp.c2
-rw-r--r--plugins/t/check_tcp.t5
2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 1c9a07b7..57e1f0df 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -614,7 +614,7 @@ print_help (void)
614 printf (_(UT_IPv46)); 614 printf (_(UT_IPv46));
615 615
616 printf (" %s\n", "-E, --escape"); 616 printf (" %s\n", "-E, --escape");
617 printf (" %s\n", _("Can use \\n, \\r, \\t or \\ in send or quit string.")); 617 printf (" %s\n", _("Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or quit option"));
618 printf (" %s\n", _("Default: nothing added to send, \\r\\n added to end of quit")); 618 printf (" %s\n", _("Default: nothing added to send, \\r\\n added to end of quit"));
619 printf (" %s\n", "-s, --send=STRING"); 619 printf (" %s\n", "-s, --send=STRING");
620 printf (" %s\n", _("String to send to the server")); 620 printf (" %s\n", _("String to send to the server"));
diff --git a/plugins/t/check_tcp.t b/plugins/t/check_tcp.t
index 67e527a0..c38fca7f 100644
--- a/plugins/t/check_tcp.t
+++ b/plugins/t/check_tcp.t
@@ -31,7 +31,10 @@ $t += checkCmd( "./check_tcp $host_tcp_http -p 80 -wt 300 -ct 600", 0
31$t += checkCmd( "./check_tcp $host_tcp_http -p 81 -wt 0 -ct 0 -to 1", 2 ); # use invalid port for this test 31$t += checkCmd( "./check_tcp $host_tcp_http -p 81 -wt 0 -ct 0 -to 1", 2 ); # use invalid port for this test
32$t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt 0 -ct 0 -to 1", 2 ); 32$t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt 0 -ct 0 -to 1", 2 );
33$t += checkCmd( "./check_tcp $hostname_invalid -p 80 -wt 0 -ct 0 -to 1", 2 ); 33$t += checkCmd( "./check_tcp $hostname_invalid -p 80 -wt 0 -ct 0 -to 1", 2 );
34$t += checkCmd( "./check_tcp $host_tcp_http -p 80 -s 'GET /\n' -e 'ThisShouldntMatch' -j", 1, $failedExpect ); 34
35# Need the \r\n to make it more standards compliant with web servers. Need the various quotes
36# so that perl doesn't interpret the \r\n and is passed onto command line correctly
37$t += checkCmd( "./check_tcp $host_tcp_http -p 80 -E -s ".'"GET /\r\n\r\n"'." -e 'ThisShouldntMatch' -j", 1, $failedExpect );
35 38
36exit(0) if defined($Test::Harness::VERSION); 39exit(0) if defined($Test::Harness::VERSION);
37exit($tests - $t); 40exit($tests - $t);