2018-10-07 10:43:09 +00:00
|
|
|
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
|
|
|
|
index 75129134..d0b926fe 100644
|
|
|
|
--- a/src/event/ngx_event_openssl.c
|
|
|
|
+++ b/src/event/ngx_event_openssl.c
|
|
|
|
@@ -2547,6 +2547,7 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
|
|
|
|
char *text)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
+ int f;
|
|
|
|
ngx_uint_t level;
|
2018-09-15 12:10:17 +00:00
|
|
|
|
2018-10-07 10:43:09 +00:00
|
|
|
level = NGX_LOG_CRIT;
|
|
|
|
@@ -2582,6 +2583,17 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
|
|
|
|
} else if (sslerr == SSL_ERROR_SSL) {
|
2018-09-15 12:10:17 +00:00
|
|
|
|
2018-10-07 10:43:09 +00:00
|
|
|
n = ERR_GET_REASON(ERR_peek_error());
|
|
|
|
+ f = ERR_GET_FUNC(ERR_peek_error());
|
2018-10-04 14:39:24 +00:00
|
|
|
+
|
2018-10-07 10:43:09 +00:00
|
|
|
+ /* Strict SNI Error Patch
|
|
|
|
+ * https://github.com/hakasenyang/openssl-patch/issues/1#issuecomment-427040319
|
|
|
|
+ */
|
|
|
|
+ if (n == SSL_R_CALLBACK_FAILED
|
|
|
|
+ && f == SSL_F_FINAL_SERVER_NAME) {
|
|
|
|
+ ERR_peek_error();
|
|
|
|
+ ERR_clear_error();
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
|
|
|
|
/* handshake failures */
|
|
|
|
if (n == SSL_R_BAD_CHANGE_CIPHER_SPEC /* 103 */
|