aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-05-29 15:58:47 +0100
committerMatt Caswell <matt@openssl.org>2018-05-31 10:39:13 +0100
commit6712ba9323cd9dc550ae3cc258cb61b5b23dcd83 (patch)
treea4fcbca24f85aaf7cb322d8d7c8cf714cc0c2b5c
parentbceae201b45fdbc7898adada6aebe2a1b6145009 (diff)
downloadopenssl-6712ba9323cd9dc550ae3cc258cb61b5b23dcd83.tar.gz
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)
-rw-r--r--apps/s_socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/s_socket.c b/apps/s_socket.c
index f4264cd9ff..76f9289002 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -147,7 +147,7 @@ int init_client(int *sock, const char *host, const char *port,
#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;