[Pkg-nagios-changes] [pkg-nagios-plugins] 136/413: fix check_http

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit fa35916c1a686f7e8ca6c80c56d1a76c3211d8af
Author: Jan Wagner <waja at cyconet.org>
Date:   Fri Jun 6 11:10:58 2008 +0000

    fix check_http
---
 debian/changelog                         |  2 ++
 debian/patches/00list                    |  1 +
 debian/patches/35_check_http_date.dpatch | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 87869f5..a2239dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ nagios-plugins (1.4.12-1) UNRELEASED; urgency=low
     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
diff --git a/debian/patches/00list b/debian/patches/00list
index 49af3e1..fcaeb19 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -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
diff --git a/debian/patches/35_check_http_date.dpatch b/debian/patches/35_check_http_date.dpatch
new file mode 100755
index 0000000..7aacdf0
--- /dev/null
+++ b/debian/patches/35_check_http_date.dpatch
@@ -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) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git