diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2016-11-18 11:51:12 +0100 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2016-11-18 11:51:12 +0100 |
| commit | 303acfc64f2f656729bde803a410a10a80a76b40 (patch) | |
| tree | 9bcc6015490531921ad5794ac55382a3a0aa96ee /plugins/check_http.c | |
| parent | 1723a3c7610cc43438c51d1e5fed43e15099a60e (diff) | |
| parent | fe1c4bb0e5ea3632d608a6b8b7e51d580856d833 (diff) | |
| download | monitoring-plugins-303acfc64f2f656729bde803a410a10a80a76b40.tar.gz | |
Merge remote-tracking branch 'monitoring-plugins/pr/1443'
* monitoring-plugins/pr/1443:
add openssl 1.1 support
Diffstat (limited to 'plugins/check_http.c')
| -rw-r--r-- | plugins/check_http.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/check_http.c b/plugins/check_http.c index 60fe4d52..2347a6f2 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
| @@ -941,8 +941,8 @@ check_http (void) | |||
| 941 | elapsed_time_ssl = (double)microsec_ssl / 1.0e6; | 941 | elapsed_time_ssl = (double)microsec_ssl / 1.0e6; |
| 942 | if (check_cert == TRUE) { | 942 | if (check_cert == TRUE) { |
| 943 | result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit); | 943 | result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit); |
| 944 | np_net_ssl_cleanup(); | ||
| 945 | if (sd) close(sd); | 944 | if (sd) close(sd); |
| 945 | np_net_ssl_cleanup(); | ||
| 946 | return result; | 946 | return result; |
| 947 | } | 947 | } |
| 948 | } | 948 | } |
| @@ -1086,10 +1086,10 @@ check_http (void) | |||
| 1086 | die (STATE_CRITICAL, _("HTTP CRITICAL - No data received from host\n")); | 1086 | die (STATE_CRITICAL, _("HTTP CRITICAL - No data received from host\n")); |
| 1087 | 1087 | ||
| 1088 | /* close the connection */ | 1088 | /* close the connection */ |
| 1089 | if (sd) close(sd); | ||
| 1089 | #ifdef HAVE_SSL | 1090 | #ifdef HAVE_SSL |
| 1090 | np_net_ssl_cleanup(); | 1091 | np_net_ssl_cleanup(); |
| 1091 | #endif | 1092 | #endif |
| 1092 | if (sd) close(sd); | ||
| 1093 | 1093 | ||
| 1094 | /* Save check time */ | 1094 | /* Save check time */ |
| 1095 | microsec = deltime (tv); | 1095 | microsec = deltime (tv); |
