[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d17bdfc26d87097c2c80854fd521b6ecebdf5ebb (commit)
      from  0973b47040df02bfa56e4a91b25621027467b16c (commit)


- Log -----------------------------------------------------------------
commit d17bdfc26d87097c2c80854fd521b6ecebdf5ebb
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jan 15 10:40:24 2018 +0100

    Fix intermittent Windows and Cygwin failures in s_server
    
    The same kind of failure that has already been observed on the
    s_client can sometimes also be observed on s_server, so we need to add
    the same kind of 50ms delay as was previously added on s_client.
    
    Ref: git commit cb2e10f257a464c6b475b321dd9e4769df84dbf6:
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/5079)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_socket.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 246153a..c8f0bb0 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -221,6 +221,20 @@ int do_server(int *accept_sock, const char *host, const char *port,
                 break;
             }
             i = (*cb)(sock, type, protocol, context);
+
+            /*
+             * Give the socket time to send its last data before we close it.
+             * No amount of setting SO_LINGER etc on the socket seems to
+             * persuade Windows to send the data before closing the socket...
+             * but sleeping for a short time seems to do it (units in ms)
+             * TODO: Find a better way to do this
+             */
+#if defined(OPENSSL_SYS_WINDOWS)
+            Sleep(50);
+#elif defined(OPENSSL_SYS_CYGWIN)
+            usleep(50000);
+#endif
+
             /*
              * If we ended with an alert being sent, but still with data in the
              * network buffer to be read, then calling BIO_closesocket() will