From efe0016a11a96d5c643b76f3b2faefebb2208418 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 22 Jan 2008 16:04:35 +0000 Subject: [PATCH] fix bogus crit log message "SSL_shutdown() failed" introduced in r1755 --- src/event/ngx_event_openssl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 3f5ea2d78..f2504eff6 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -1037,17 +1037,14 @@ ngx_ssl_shutdown(ngx_connection_t *c) /* SSL_shutdown() never returns -1, on error it returns 0 */ - if (n != 1) { + if (n != 1 && ERR_peek_error()) { sslerr = SSL_get_error(c->ssl->connection, n); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_get_error: %d", sslerr); } - if (n == 1 - || sslerr == SSL_ERROR_ZERO_RETURN - || (sslerr == 0 && c->timedout)) - { + if (n == 1 || sslerr == 0 || sslerr == SSL_ERROR_ZERO_RETURN) { SSL_free(c->ssl->connection); c->ssl = NULL;