From 44e688bca36ab4e1b4cd1cf6710871b7906e7c96 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 14 Jan 2018 17:15:32 +0100 Subject: [PATCH] Fix intermittent Cygwin failures in s_client This was identified for Windows almost two years ago for VC and msys/mingw. It seems that Cygwin suffers from the same issue, and since Cygwin doesn't define OPENSSL_SYS_WINDOWS, we need to make a special case to have a 50ms pause before closing the TLS connection. Ref: git commit cb2e10f257a464c6b475b321dd9e4769df84dbf6 Reviewed-by: Bernd Edlinger (Merged from https://github.com/openssl/openssl/pull/5074) (cherry picked from commit 27da42d85212f80fc0db02b1cedf1d49fbfb8c43) --- apps/s_client.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/s_client.c b/apps/s_client.c index d1605454b9..3b6606963d 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -2461,7 +2461,7 @@ int s_client_main(int argc, char **argv) if (in_init) print_stuff(bio_c_out, con, full_log); do_ssl_shutdown(con); -#if defined(OPENSSL_SYS_WINDOWS) + /* * 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 @@ -2469,8 +2469,12 @@ int s_client_main(int argc, char **argv) * 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 -- 2.25.1