commit efe0016a11a96d5c643b76f3b2faefebb2208418
author Igor Sysoev <igor@sysoev.ru> Tue Jan 22 16:04:35 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Jan 22 16:04:35 2008 +0000
tree b1cbf7d3d43fe7e8a4d16901ac7f46d420ec8910
parent fa0d3e1a10acc379c2fe0595a97833b0919d57cb

fix bogus crit log message "SSL_shutdown() failed" introduced in r1755

src/event/ngx_event_openssl.c

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 3f5ea2d..f2504ef 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1037,17 +1037,14 @@
 
     /* 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;