[nginx] svn commit: r4237 - trunk/src/event

[igor at sysoev.ru]

Author: is
Date: 2011-10-31 14:30:03 +0000 (Mon, 31 Oct 2011)
New Revision: 4237

Modified:
   trunk/src/event/ngx_event_openssl.c
Log:
Silently ignoring a stale global SSL error left after disabled renegotiation.


Modified: trunk/src/event/ngx_event_openssl.c
===================================================================
--- trunk/src/event/ngx_event_openssl.c	2011-10-31 10:38:20 UTC (rev 4236)
+++ trunk/src/event/ngx_event_openssl.c	2011-10-31 14:30:03 UTC (rev 4237)
@@ -863,6 +863,13 @@
 
         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;