Merge branch 'development' into development-restricted
This commit is contained in:
commit
bec9a9b57a
1 changed files with 8 additions and 4 deletions
|
@ -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" );
|
||||||
ret = 0;
|
if( ret == MBEDTLS_ERR_NET_INVALID_CONTEXT )
|
||||||
|
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" );
|
||||||
ret = 0;
|
if( ret == MBEDTLS_ERR_NET_ACCEPT_FAILED )
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue