]> git.kaiwu.me - nginx.git/commitdiff
Silently ignoring a stale global SSL error left after disabled renegotiation.
authorIgor Sysoev <igor@sysoev.ru>
Mon, 31 Oct 2011 14:30:03 +0000 (14:30 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Mon, 31 Oct 2011 14:30:03 +0000 (14:30 +0000)
src/event/ngx_event_openssl.c

index 9f64ea2c55e96d397f130b52f1f21451a3165cc7..82936906f6a92c6b5a395727f4c94e68b3416e17 100644 (file)
@@ -863,6 +863,13 @@ ngx_ssl_handle_recv(ngx_connection_t *c, int n)
 
         ngx_log_error(NGX_LOG_NOTICE, c->log, 0, "SSL renegotiation disabled");
 
+        while (ERR_peek_error()) {
+            ngx_ssl_error(NGX_LOG_DEBUG, c->log, 0,
+                          "ignoring stale global SSL error");
+        }
+
+        ERR_clear_error();
+
         c->ssl->no_wait_shutdown = 1;
         c->ssl->no_send_shutdown = 1;