Fixed check_http not timing-out on redirects

This commit is contained in:
Thomas Guyot-Sionnest thomas@aei.ca 2009-03-19 13:59:43 -07:00
parent 37e432ec77
commit 3dd27fb063
2 changed files with 4 additions and 3 deletions

1
NEWS
View file

@ -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)

View file

@ -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);
}