From: Andy Polyakov <appro@openssl.org>
Date: Thu, 5 Apr 2018 16:59:36 +0000 (+0200)
Subject: apps/s_socket.c: disable the Nagle algorithm.
X-Git-Tag: OpenSSL_1_1_1-pre5~43
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=dcf3d83faf3542b984d5586bdb1d50c90137a29d

apps/s_socket.c: disable the Nagle algorithm.

Without TCP_NODELAY alerts risk to be dropped between shutdown and close.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5887)
---

diff --git a/apps/s_socket.c b/apps/s_socket.c
index e3cfda98ae..80b63ebc4d 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -146,7 +146,7 @@ int init_client(int *sock, const char *host, const char *port,
         }
 #endif
 
-        if (!BIO_connect(*sock, BIO_ADDRINFO_address(ai), 0)) {
+        if (!BIO_connect(*sock, BIO_ADDRINFO_address(ai), BIO_SOCK_NODELAY)) {
             BIO_closesocket(*sock);
             *sock = INVALID_SOCKET;
             continue;
@@ -330,6 +330,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
                 BIO_closesocket(asock);
                 break;
             }
+            BIO_set_tcp_ndelay(sock, 1);
             i = (*cb)(sock, type, protocol, context);
 
             /*