Fixed check_http not timing-out on redirects

diff --git a/NEWS b/NEWS
index 00e03510fb3c8a025205b2fa6602d4b09e282ec9..cfc0a7c7f2a54b2f83f05f6e8da2e49f3217ef08 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ This file documents the major additions and syntax changes between releases.
        Fixed coredump from check_nt when invalid drive is specified (#2179754 - Olli Hauer)
        Fixed passing of quotes in OID for check_snmp (#1985230 - Jan Wagner, patch by John Barbuto)
        Fixed check_http sending HTTP/1.0 with v1.1 headers (#2638765)
+       Fixed check_http not timing-out on redirects
 
 1.4.13 25th Sept 2008
        Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 2f2460c637b53c0604ab6d31c23de961376f4d93..72d0a2b6d52e00548a2a584f2a38414436b33d35 100644 (file)
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -894,9 +894,6 @@ check_http (void)
 #endif
   if (sd) close(sd);
 
-  /* reset the alarm */
-  alarm (0);
-
   /* Save check time */
   microsec = deltime (tv);
   elapsed_time = (double)microsec / 1.0e6;
@@ -999,6 +996,9 @@ check_http (void)
 
   } /* end else (server_expect_yn)  */
 
+  /* reset the alarm - must be called *after* redir or we'll never die on redirects! */
+  alarm (0);
+
   if (maximum_age >= 0) {
     result = max_state_alt(check_document_dates(header, &msg), result);
   }