From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Sun, 14 Jan 2018 17:17:59 +0000 (+0100)
Subject: Use constant value 1 instead of SHUT_WR in do_server
X-Git-Tag: OpenSSL_1_1_1-pre1~196
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=803141f6100ca8d756928328a262e1dc52daef2d;p=oweals%2Fopenssl.git

Use constant value 1 instead of SHUT_WR in do_server

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

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 2f3e90bbf9..246153a79b 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -231,13 +231,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
              * and then closing the socket sends TCP-FIN first followed by
              * TCP-RST. This seems to allow the peer to read the alert data.
              */
-#ifdef _WIN32
-# ifdef SD_SEND
-            shutdown(sock, SD_SEND);
-# endif
-#elif defined(SHUT_WR)
-            shutdown(sock, SHUT_WR);
-#endif
+            shutdown(sock, 1); /* SHUT_WR */
             BIO_closesocket(sock);
         } else {
             i = (*cb)(asock, type, protocol, context);