删掉SSL_ERROR_ZERO_RETURN时的retry逻辑

This commit is contained in:
崔一鸣
2019-07-19 13:01:45 +08:00
parent 65000c889e
commit 1b13ef037c

View File

@@ -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_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
SSL_CTX_set_options(sslctx, SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS); SSL_CTX_set_options(sslctx, SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS);
if (mgr->no_ssl2) if (mgr->no_ssl2)
{ {
SSL_CTX_set_options(sslctx, SSL_OP_NO_SSLv2); 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; goto retry;
case SSL_ERROR_WANT_WRITE: want = EV_WRITE; case SSL_ERROR_WANT_WRITE: want = EV_WRITE;
goto retry; goto retry;
case SSL_ERROR_ZERO_RETURN: goto retry; case SSL_ERROR_ZERO_RETURN:
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
case SSL_ERROR_SSL: goto complete; case SSL_ERROR_SSL: goto complete;
default: TFE_LOG_ERROR(logger, "Unhandled SSL_shutdown() " default: TFE_LOG_ERROR(logger, "Unhandled SSL_shutdown() "
@@ -2064,7 +2063,7 @@ retry:
if (ctx->ev) if (ctx->ev)
{ {
event_add(ctx->ev, &retry_delay); event_add(ctx->ev, NULL);
} }
else else
{ {