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

…-on-shutdown Clear SSL error queue on shutdown
sysown · May 24, 2024 · 7ec6e14 · 7ec6e14
2 parents f7c0382 + 2e4ef16
commit 7ec6e14
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/mysql_data_stream.cpp b/lib/mysql_data_stream.cpp
@@ -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);