[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_1_0-stable has been updated
       via  cffda9f3b76e1b85739984bce6146d792499cce2 (commit)
      from  70fdff68ce9be51cf59c23e1d1a43dcaf8264bbb (commit)


- Log -----------------------------------------------------------------
commit cffda9f3b76e1b85739984bce6146d792499cce2
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Jan 14 18:17:59 2018 +0100

    Use constant value 1 instead of SHUT_WR in do_server
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5072)
    
    (cherry picked from commit 803141f6100ca8d756928328a262e1dc52daef2d)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_socket.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 2af1b4b..9988626 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -188,13 +188,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, context);