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

[Jan Wagner]

tags 460097 pending
thanks

Author: waja-guest
Date: 2008-06-06 11:10:58 +0000 (Fri, 06 Jun 2008)
New Revision: 1470

Added:
   nagios-plugins/trunk/debian/patches/35_check_http_date.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
fix check_http

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2008-06-06 10:35:51 UTC (rev 1469)
+++ nagios-plugins/trunk/debian/changelog	2008-06-06 11:10:58 UTC (rev 1470)
@@ -28,6 +28,8 @@
     perl of check_disk_smb (Closes: #478906)
   * add 34_fix_smbclient_check_disk_smb.dpatch which fixes usage of smbclient
     (Closes: #478942)
+  * add 35_check_http_date.dpatch which fixes date parsing of check_http,
+    thanks Hilko Bengen <bengen at debian.org> for providing it (Closes: #460097)
 
   [ Alexander Wirt ]
   * Call smbclient with -N (supress password prompt) if no password is

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2008-06-06 10:35:51 UTC (rev 1469)
+++ nagios-plugins/trunk/debian/patches/00list	2008-06-06 11:10:58 UTC (rev 1470)
@@ -9,4 +9,5 @@
 32_check_ldap_pointer.dpatch
 33_fix_emb_check_disk_smb.dpatch
 34_fix_smbclient_check_disk_smb.dpatch
+35_check_http_date.dpatch
 50_misc_typos.dpatch

Added: nagios-plugins/trunk/debian/patches/35_check_http_date.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/35_check_http_date.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/35_check_http_date.dpatch	2008-06-06 11:10:58 UTC (rev 1470)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 35_check_http_date.dpatch by Jan Wagner <waja at cyconet.org>
+## patch provided by Hilko Bengen <bengen at debian.org>
+##
+## DP: Prevents check_http from trying to extract Date or
+## DP: Last-Modified header from file content.N
+
+ at DPATCH@
+diff -urNad nagios-plugins-1.4.12~/plugins/check_http.c nagios-plugins-1.4.12/plugins/check_http.c
+--- nagios-plugins-1.4.12~/plugins/check_http.c	2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_http.c	2008-06-06 13:03:33.000000000 +0200
+@@ -598,7 +598,10 @@
+     /* Skip to the end of the header, including continuation lines. */
+     while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t')))
+       s++;
+-    s++;
++
++    /* Avoid stepping over end-of-string marker */
++    if (*s)
++      s++;
+ 
+     /* Process this header. */
+     if (value && value > field+2) {


Property changes on: nagios-plugins/trunk/debian/patches/35_check_http_date.dpatch
___________________________________________________________________
Name: svn:executable
   + *