TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-04-06 12:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream-public/pr/1291' into mbedtls-1.3

Browse Source
This commit is contained in:
Jaeden Amero
2018-01-29 12:50:39 +00:00
parent 5d4c2a0fd0 e10d634856
commit 8c01acdd9e
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
programs/ssl/ssl_server2.c
View File

@@ -1620,8 +1620,13 @@ reset:
#if !defined(_WIN32) #if !defined(_WIN32)
if( received_sigterm ) if( received_sigterm )
{ {
polarssl_printf( " interrupted by SIGTERM\n" ); polarssl_printf( " interrupted by SIGTERM (not in net_accept())\n" );
ret = 0; if( ret == POLARSSL_ERR_NET_RECV_FAILED ||
ret == POLARSSL_ERR_NET_SEND_FAILED )
{
ret = 0;
}
goto exit; goto exit;
} }
#endif #endif
@@ -1653,8 +1658,10 @@ reset:
#if !defined(_WIN32) #if !defined(_WIN32)
if( received_sigterm ) if( received_sigterm )
{ {
polarssl_printf( " interrupted by signal\n" ); polarssl_printf( " interrupted by SIGTERM (in net_accept())\n" );
ret = 0; if( ret == POLARSSL_ERR_NET_ACCEPT_FAILED )
ret = 0;
goto exit; goto exit;
} }
#endif #endif