projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
70fdff6
)
Use constant value 1 instead of SHUT_WR in do_server
author
Bernd Edlinger
<bernd.edlinger@hotmail.de>
Sun, 14 Jan 2018 17:17:59 +0000
(18:17 +0100)
committer
Bernd Edlinger
<bernd.edlinger@hotmail.de>
Sun, 14 Jan 2018 19:47:10 +0000
(20:47 +0100)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5072)
(cherry picked from commit
803141f6100ca8d756928328a262e1dc52daef2d
)
apps/s_socket.c
patch
|
blob
|
history
diff --git
a/apps/s_socket.c
b/apps/s_socket.c
index 2af1b4b2039f10d2f9465eace913a71003abf364..9988626d33cea31f75fe6ba813b1454e23952fa8 100644
(file)
--- 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);