Merge pull request #4555 from joshuahunt/johunt/clear-ssl-error-queue-on-shutdown

Clear SSL error queue on shutdown
use-wrlock-in-dns-cache-empty
Javier Jaramago Fernández 2 years ago committed by GitHub
commit 7ec6e143d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -433,7 +433,8 @@ MySQL_Data_Stream::~MySQL_Data_Stream() {
// other part, we perform a 'quiet' shutdown. For more context see
// MYSQL #29579.
SSL_set_quiet_shutdown(ssl, 1);
SSL_shutdown(ssl);
if (SSL_shutdown(ssl) < 0)
ERR_clear_error();
}
if (ssl) SSL_free(ssl);
}
@ -515,7 +516,8 @@ void MySQL_Data_Stream::shut_hard() {
// other part, we perform a 'quiet' shutdown. For more context see
// MYSQL #29579.
SSL_set_quiet_shutdown(ssl, 1);
SSL_shutdown(ssl);
if (SSL_shutdown(ssl) < 0)
ERR_clear_error();
}
if (fd >= 0) {
shutdown(fd, SHUT_RDWR);

Loading…
Cancel
Save