aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-10-31 14:30:03 +0000
committerIgor Sysoev <igor@sysoev.ru>2011-10-31 14:30:03 +0000
commita2ffa56106858e8c54ab7606c7ccaea8da7fd290 (patch)
treea2ffdf3bd90154e5f69ddacfa18458c87b11d446 /src
parent308c7de96695137f16ae586bd8ecee1b4c7c402a (diff)
downloadnginx-a2ffa56106858e8c54ab7606c7ccaea8da7fd290.tar.gz
nginx-a2ffa56106858e8c54ab7606c7ccaea8da7fd290.zip
Silently ignoring a stale global SSL error left after disabled renegotiation.
Diffstat (limited to 'src')
-rw-r--r--src/event/ngx_event_openssl.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 9f64ea2c5..82936906f 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -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;