Mercurial > hg > nginx
changeset 1865:4bcbb0fe5c8d
fix bogus crit log message "SSL_shutdown() failed" introduced in r1755
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 22 Jan 2008 16:04:35 +0000 |
parents | 524831ec3e69 |
children | d5557e6a4224 |
files | src/event/ngx_event_openssl.c |
diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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;