From 1b13ef037c49e95585dfd8f8bee89bbdc0c5a923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B4=94=E4=B8=80=E9=B8=A3?= Date: Fri, 19 Jul 2019 13:01:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E6=8E=89SSL=5FERROR=5FZERO=5FRETURN?= =?UTF-8?q?=E6=97=B6=E7=9A=84retry=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/src/ssl_stream.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/platform/src/ssl_stream.cpp b/platform/src/ssl_stream.cpp index 12e2748..1535c68 100644 --- a/platform/src/ssl_stream.cpp +++ b/platform/src/ssl_stream.cpp @@ -1610,7 +1610,6 @@ static void sslctx_set_opts(SSL_CTX * sslctx, struct ssl_mgr * mgr) SSL_CTX_set_options(sslctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION); SSL_CTX_set_options(sslctx, SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS); - if (mgr->no_ssl2) { SSL_CTX_set_options(sslctx, SSL_OP_NO_SSLv2); @@ -2026,7 +2025,7 @@ static void pxy_ssl_shutdown_cb(evutil_socket_t fd, short what, void * arg) goto retry; case SSL_ERROR_WANT_WRITE: want = EV_WRITE; goto retry; - case SSL_ERROR_ZERO_RETURN: goto retry; + case SSL_ERROR_ZERO_RETURN: case SSL_ERROR_SYSCALL: case SSL_ERROR_SSL: goto complete; default: TFE_LOG_ERROR(logger, "Unhandled SSL_shutdown() " @@ -2064,7 +2063,7 @@ retry: if (ctx->ev) { - event_add(ctx->ev, &retry_delay); + event_add(ctx->ev, NULL); } else {