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

This commit is contained in:
Jaeden Amero 2018-01-29 12:50:39 +00:00
commit 8c01acdd9e

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