mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Bug#24148 regression tests hang with SSL enabled
- Don't call SSL_shutdown a second time
This commit is contained in:
parent
ad0d802530
commit
945c35eee9
1 changed files with 9 additions and 5 deletions
14
vio/viossl.c
14
vio/viossl.c
|
|
@ -126,12 +126,16 @@ int vio_ssl_close(Vio *vio)
|
|||
{
|
||||
switch ((r= SSL_shutdown(ssl)))
|
||||
{
|
||||
case 1: /* Shutdown successful */
|
||||
case 1:
|
||||
/* Shutdown successful */
|
||||
break;
|
||||
case 0:
|
||||
/*
|
||||
Shutdown not yet finished - since the socket is going to
|
||||
be closed there is no need to call SSL_shutdown() a second
|
||||
time to wait for the other side to respond
|
||||
*/
|
||||
break;
|
||||
case 0: /* Shutdown not yet finished, call it again */
|
||||
if ((r= SSL_shutdown(ssl) >= 0))
|
||||
break;
|
||||
/* Fallthrough */
|
||||
default: /* Shutdown failed */
|
||||
DBUG_PRINT("vio_error", ("SSL_shutdown() failed, error: %d",
|
||||
SSL_get_error(ssl, r)));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue