Merge branch 'development' into iotssl-1204
This commit is contained in:
commit
2bd57578af
424 changed files with 19733 additions and 5914 deletions
|
@ -327,7 +327,7 @@ int main( void )
|
|||
#define USAGE \
|
||||
"\n usage: ssl_server2 param=<>...\n" \
|
||||
"\n acceptable parameters:\n" \
|
||||
" server_addr=%%d default: (all interfaces)\n" \
|
||||
" server_addr=%%s default: (all interfaces)\n" \
|
||||
" server_port=%%d default: 4433\n" \
|
||||
" debug_level=%%d default: 0 (disabled)\n" \
|
||||
" nbio=%%d default: 0 (blocking I/O)\n" \
|
||||
|
@ -2105,8 +2105,10 @@ reset:
|
|||
#if !defined(_WIN32)
|
||||
if( received_sigterm )
|
||||
{
|
||||
mbedtls_printf( " interrupted by SIGTERM\n" );
|
||||
ret = 0;
|
||||
mbedtls_printf( " interrupted by SIGTERM (not in net_accept())\n" );
|
||||
if( ret == MBEDTLS_ERR_NET_INVALID_CONTEXT )
|
||||
ret = 0;
|
||||
|
||||
goto exit;
|
||||
}
|
||||
#endif
|
||||
|
@ -2142,8 +2144,10 @@ reset:
|
|||
#if !defined(_WIN32)
|
||||
if( received_sigterm )
|
||||
{
|
||||
mbedtls_printf( " interrupted by signal\n" );
|
||||
ret = 0;
|
||||
mbedtls_printf( " interrupted by SIGTERM (in net_accept())\n" );
|
||||
if( ret == MBEDTLS_ERR_NET_ACCEPT_FAILED )
|
||||
ret = 0;
|
||||
|
||||
goto exit;
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue