commit e34e32401793d0687c98b2e5ec2688e16cf76271
author Jaeden Amero <jaeden.amero@arm.com> Mon Jan 29 12:52:33 2018 +0000
committer Jaeden Amero <jaeden.amero@arm.com> Mon Jan 29 12:52:33 2018 +0000
tree 8d8e31fa31e8b1962525a4f716be9b91a87268ef
parent 2b72742e3f6bae1f5cd5cbfbf4bd7be51e495acc
parent 16499b5cbb849c2f54dff2d0a57639cce0126910

Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 0271a8f..3b4a54c 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1989,8 +1989,10 @@
 #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
@@ -2026,8 +2028,10 @@
 #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