commit bec9a9b57a26f2ca81e5566f9427b1f7d1d05177
author Jaeden Amero <jaeden.amero@arm.com> Mon Jan 29 12:49:23 2018 +0000
committer Jaeden Amero <jaeden.amero@arm.com> Mon Jan 29 12:49:23 2018 +0000
tree 38c376b91f309352a14addf4e4549150b333d3f7
parent ade51aff1a9e387fd519065121f24a6b64ae3115
parent 4d3e1582b0d03a2ad39bfb94ef57c5be36a23132

Merge branch 'development' into development-restricted

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 1285abc..cc29b49 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -2019,8 +2019,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
@@ -2056,8 +2058,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