From bc2bb78010fe04bbc1c7a42c72d6fece1519e8a6 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Tue, 6 Nov 2018 14:09:46 -0700
Subject: [PATCH] Fix -x option in server to continue in event of error (R)

---
 examples/server/server.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/server/server.c b/examples/server/server.c
index 215a5b040..48da1c392 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -1826,17 +1826,17 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
             err = SSL_get_error(ssl, 0);
             printf("SSL_accept error %d, %s\n", err,
                                                 ERR_error_string(err, buffer));
-            /* cleanup */
-            SSL_free(ssl); ssl = NULL;
-            SSL_CTX_free(ctx); ctx = NULL;
-            CloseSocket(clientfd);
-            CloseSocket(sockfd);
-
-            if (!exitWithRet)
+            if (!exitWithRet) {
                 err_sys_ex(runWithErrors, "SSL_accept failed");
-
-            ((func_args*)args)->return_code = err;
-            goto exit;
+            } else {
+                /* cleanup */
+                SSL_free(ssl); ssl = NULL;
+                SSL_CTX_free(ctx); ctx = NULL;
+                CloseSocket(clientfd);
+                CloseSocket(sockfd);
+                ((func_args*)args)->return_code = err;
+                goto exit;
+            }
         }
 
         showPeerEx(ssl, lng_index);