# Fixed upstream tags 502529 + patch thanks Here is the patch, in case anybody will fix it in unstable. As it is planed to release 1.4.14 soon, I intend to fix it with packaging the next upstream version when lenny is out of the door. This fix is a bit too late for it.
With kind regards, Jan. -- Never write mail to <[email protected]>, you have been warned! -----BEGIN GEEK CODE BLOCK----- Version: 3.1 GIT d-- s+: a- C+++ UL++++ P+ L+++ E- W+++ N+++ o++ K++ w--- O M V- PS PE Y++ PGP++ t-- 5 X R tv- b+ DI- D++ G++ e++ h-- r+++ y+++ ------END GEEK CODE BLOCK------
From: Thomas Guyot-Sionnest <[email protected]> Date: Thu, 5 Feb 2009 05:08:54 +0000 (-0500) Subject: check_http --onredirect=sticky follows using the same IP address (sf.net #2550208). X-Git-Url: http://repo.or.cz/w/nagiosplugins.git?a=commitdiff_plain;h=d00a53dd1e4b818f36dd8ef0ee9245445b0ee8e9 check_http --onredirect=sticky follows using the same IP address (sf.net #2550208). --- diff --git a/NEWS b/NEWS index 5ba4758..743857f 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,7 @@ This file documents the major additions and syntax changes between releases. Re-bundled libtap as a built-in library (--enable-libtap): detects system library as pre-1.4.13 and does not install the built-in library anymore Fixed check_mrtg returning UNKNOWN instead of OK (bug #2378068) Fixed check_http behaviour: all check are now performed as long as a valid response is returned (sf.net #1460312) + check_http --onredirect=sticky follows using the same IP address (sf.net #2550208). 1.4.13 25th Sept 2008 Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen) diff --git a/plugins/check_http.c b/plugins/check_http.c index 933e9d4..620e157 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -106,6 +106,7 @@ int display_html = FALSE; char **http_opt_headers; int http_opt_headers_count = 0; int onredirect = STATE_OK; +int followsticky = 0; int use_ssl = FALSE; int verbose = FALSE; int sd; @@ -299,8 +300,10 @@ process_arguments (int argc, char **argv) server_port = HTTPS_PORT; break; case 'f': /* onredirect */ + if (!strcmp (optarg, "sticky")) + onredirect = STATE_DEPENDENT, followsticky = 1; if (!strcmp (optarg, "follow")) - onredirect = STATE_DEPENDENT; + onredirect = STATE_DEPENDENT, followsticky = 0; if (!strcmp (optarg, "unknown")) onredirect = STATE_UNKNOWN; if (!strcmp (optarg, "ok")) @@ -1200,8 +1203,10 @@ redir (char *pos, char *status_line) free (host_name); host_name = strdup (addr); - free (server_address); - server_address = strdup (addr); + if (followsticky == 0) { + free (server_address); + server_address = strdup (addr); + } free (server_url); server_url = url; @@ -1338,8 +1343,9 @@ print_help (void) printf (" %s\n", _(" Any other tags to be sent in http header. Use multiple times for additional headers")); printf (" %s\n", "-L, --link"); printf (" %s\n", _("Wrap output in HTML link (obsoleted by urlize)")); - printf (" %s\n", "-f, --onredirect=<ok|warning|critical|follow>"); - printf (" %s\n", _("How to handle redirected pages")); + printf (" %s\n", "-f, --onredirect=<ok|warning|critical|follow|sticky>"); + printf (" %s\n", _("How to handle redirected pages. sticky is like follow but stick to the")); + printf (" %s\n", _("specified IP address")); printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>"); printf (" %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
signature.asc
Description: This is a digitally signed message part.
