3 files changed, 8 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 3f1fece7..7eb3098f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 This file documents the major additions and syntax changes between releases.
 
+1.4.?? ??th ??? 200?
+	Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)
+
 1.4.12 27th May 2008
 	Added ./check_nt -v INSTANCES to count number of instances (Alessandro Ren)
 	New check_icmp -s option to specify the source IP address
diff --git a/THANKS.in b/THANKS.in
index 04a6d3c7..718d0f32 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -235,3 +235,4 @@ Matthias Urlichs
 Jan Wagner
 Christian Schneemann
 Rob Windsor
+Hilko Bengen
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 42636cd0..07e0079e 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -598,7 +598,10 @@ check_document_dates (const char *headers)
     /* 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) {