[Pkg-nagios-changes] [pkg-nagios] r1504 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

tags 486932 pending
thanks

Author: waja-guest
Date: 2008-06-19 14:06:58 +0000 (Thu, 19 Jun 2008)
New Revision: 1504

Added:
   nagios-plugins/trunk/debian/patches/40_check_http_status_line.patch
Modified:
   nagios-plugins/trunk/debian/changelog
Log:
add status_line to check_http output

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2008-06-18 12:10:40 UTC (rev 1503)
+++ nagios-plugins/trunk/debian/changelog	2008-06-19 14:06:58 UTC (rev 1504)
@@ -1,3 +1,10 @@
+nagios-plugins (1.4.12-2) UNRELEASED; urgency=low
+
+  * add 40_check_http_status_line.dpatch to add content of the status_line
+    into the check_http output (Closes: #486932)
+
+ -- Jan Wagner <waja at cyconet.org>  Wed, 18 Jun 2008 13:53:00 +0200
+
 nagios-plugins (1.4.12-1) unstable; urgency=low
 
   [ Jan Wagner ]

Added: nagios-plugins/trunk/debian/patches/40_check_http_status_line.patch
===================================================================
--- nagios-plugins/trunk/debian/patches/40_check_http_status_line.patch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/40_check_http_status_line.patch	2008-06-19 14:06:58 UTC (rev 1504)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_check_http_status_line.dpatch by Jan Wagner <waja at cyconet.org>
+## patch provided by Josip Rodin <joy at debbugs.entuzijast.net>
+##
+## DP: adds status_line to check_http output
+
+ at DPATCH@
+--- check_http.c~	2008-06-19 11:42:25.000000000 +0200
++++ check_http.c	2008-06-19 11:42:25.000000000 +0200
+@@ -912,11 +912,12 @@
+   if (!strstr (status_line, server_expect)) {
+     if (server_port == HTTP_PORT)
+       asprintf (&msg,
+-                _("Invalid HTTP response received from host\n"));
++                _("Invalid HTTP response received from host: %s\n"),
++                status_line);
+     else
+       asprintf (&msg,
+-                _("Invalid HTTP response received from host on port %d\n"),
+-                server_port);
++                _("Invalid HTTP response received from host on port %d: %s\n"),
++                server_port, status_line);
+     die (STATE_CRITICAL, "%s", msg);
+   }
+