diff options
author | Richard Leitner <me@g0hl1n.net> | 2013-05-29 15:02:15 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@sonydadc.com> | 2013-05-29 15:02:15 +0200 |
commit | 14225eb4641af25f3317e4ee3d8af7007b55bf42 (patch) | |
tree | 21d09f261f4b13674d956a59f6f3e89c0319c400 /plugins | |
parent | 1fd504b6117af25d3baa0c1afc5dbf7fc3c66f2c (diff) | |
download | monitoring-plugins-14225eb4641af25f3317e4ee3d8af7007b55bf42.tar.gz |
Fixed SF.net bug #3571331, check_http converts semicolon to newline in -k
This commit fixes sourceforge.net bug id 3571331.
The semicolon was defined as input delimiter for multiple values in the -k arguments.
Due to the fact the semicolon is a valid character for HTTP header fields this input delimiter function was removed.
It is still possible to pass multiple header fields via multiple -k (like described in helptext).
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/check_http.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/check_http.c b/plugins/check_http.c index 9231a559..110875d6 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
@@ -43,7 +43,6 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; | |||
43 | #include "base64.h" | 43 | #include "base64.h" |
44 | #include <ctype.h> | 44 | #include <ctype.h> |
45 | 45 | ||
46 | #define INPUT_DELIMITER ";" | ||
47 | #define STICKY_NONE 0 | 46 | #define STICKY_NONE 0 |
48 | #define STICKY_HOST 1 | 47 | #define STICKY_HOST 1 |
49 | #define STICKY_PORT 2 | 48 | #define STICKY_PORT 2 |
@@ -854,8 +853,7 @@ check_http (void) | |||
854 | /* optionally send any other header tag */ | 853 | /* optionally send any other header tag */ |
855 | if (http_opt_headers_count) { | 854 | if (http_opt_headers_count) { |
856 | for (i = 0; i < http_opt_headers_count ; i++) { | 855 | for (i = 0; i < http_opt_headers_count ; i++) { |
857 | for ((pos = strtok(http_opt_headers[i], INPUT_DELIMITER)); pos; (pos = strtok(NULL, INPUT_DELIMITER))) | 856 | xasprintf (&buf, "%s%s\r\n", buf, http_opt_headers[i]); |
858 | xasprintf (&buf, "%s%s\r\n", buf, pos); | ||
859 | } | 857 | } |
860 | /* This cannot be free'd here because a redirection will then try to access this and segfault */ | 858 | /* This cannot be free'd here because a redirection will then try to access this and segfault */ |
861 | /* Covered in a testcase in tests/check_http.t */ | 859 | /* Covered in a testcase in tests/check_http.t */ |