commit 575c1abda2d59cae58e61c1a7d93d6f913608f56
author Jaeden Amero <jaeden.amero@arm.com> Mon Jan 29 12:50:44 2018 +0000
committer Jaeden Amero <jaeden.amero@arm.com> Mon Jan 29 12:50:44 2018 +0000
tree 70824ee80f6215f515c8588fbeb9ad336cc0bf5c
parent 9233be659d26a540dd0918c48f6252cce69a262c
parent 8c01acdd9ecfd26662186a6736498a1ee280e5ce

Merge branch 'mbedtls-1.3' into mbedtls-1.3-restricted

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 2e76efe..f7f79ab 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1620,8 +1620,13 @@
 #if !defined(_WIN32)
     if( received_sigterm )
     {
-        polarssl_printf( " interrupted by SIGTERM\n" );
-        ret = 0;
+        polarssl_printf( " interrupted by SIGTERM (not in net_accept())\n" );
+        if( ret == POLARSSL_ERR_NET_RECV_FAILED ||
+            ret == POLARSSL_ERR_NET_SEND_FAILED )
+        {
+            ret = 0;
+        }
+
         goto exit;
     }
 #endif
@@ -1653,8 +1658,10 @@
 #if !defined(_WIN32)
         if( received_sigterm )
         {
-            polarssl_printf( " interrupted by signal\n" );
-            ret = 0;
+            polarssl_printf( " interrupted by SIGTERM (in net_accept())\n" );
+            if( ret == POLARSSL_ERR_NET_ACCEPT_FAILED )
+                ret = 0;
+
             goto exit;
         }
 #endif