mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

Browse source 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
msvensson@pilot.mysql.com 2006-12-22 00:39:08 +01:00
commit acc5e0e3d5
6 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
vio/viossl.c
View file

@ -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)));