Merge branch 'development' into development-restricted

This commit is contained in:
Jaeden Amero 2018-01-29 12:49:23 +00:00
commit bec9a9b57a

View File

@ -2019,8 +2019,10 @@ reset:
#if !defined(_WIN32) #if !defined(_WIN32)
if( received_sigterm ) if( received_sigterm )
{ {
mbedtls_printf( " interrupted by SIGTERM\n" ); mbedtls_printf( " interrupted by SIGTERM (not in net_accept())\n" );
if( ret == MBEDTLS_ERR_NET_INVALID_CONTEXT )
ret = 0; ret = 0;
goto exit; goto exit;
} }
#endif #endif
@ -2056,8 +2058,10 @@ reset:
#if !defined(_WIN32) #if !defined(_WIN32)
if( received_sigterm ) if( received_sigterm )
{ {
mbedtls_printf( " interrupted by signal\n" ); mbedtls_printf( " interrupted by SIGTERM (in net_accept())\n" );
if( ret == MBEDTLS_ERR_NET_ACCEPT_FAILED )
ret = 0; ret = 0;
goto exit; goto exit;
} }
#endif #endif