commit 6712ba9323cd9dc550ae3cc258cb61b5b23dcd83
author Matt Caswell <matt@openssl.org> Tue May 29 15:58:47 2018 +0100
committer Matt Caswell <matt@openssl.org> Thu May 31 10:39:13 2018 +0100
tree a4fcbca24f85aaf7cb322d8d7c8cf714cc0c2b5c
parent bceae201b45fdbc7898adada6aebe2a1b6145009

Only set TCP_NODELAY if the protocol is TCP

This doesn't apply if we're doing DTLS, or using UNIX domain sockets.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6373)

apps/s_socket.c

diff --git a/apps/s_socket.c b/apps/s_socket.c
index f4264cd..76f9289 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -147,7 +147,7 @@
 #endif
 
         if (!BIO_connect(*sock, BIO_ADDRINFO_address(ai),
-                         type == SOCK_STREAM ? BIO_SOCK_NODELAY : 0)) {
+                         protocol == IPPROTO_TCP ? BIO_SOCK_NODELAY : 0)) {
             BIO_closesocket(*sock);
             *sock = INVALID_SOCKET;
             continue;