postgres.git / summary / log / commit / refs

commit    ed52c3707bcf8858defb0d9de4b55f5c7f18fed7
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Tue Dec 07 18:34:06 2021 +0000

    On Windows, also call shutdown() while closing the client socket.
    
    Further experimentation shows that commit 6051857fc is not sufficient
    when using (some versions of?) OpenSSL.  The reason is obscure, but
    calling shutdown(socket, SD_SEND) improves matters.
    
    Per testing by Andrew Dunstan and Alexander Lakhin.
    Back-patch as before.
    
    Discussion: https://postgr.es/m/af5e0bf3-6a61-bb97-6cba-061ddf22ff6b@dunslane.net


 src/backend/libpq/pqcomm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 96ab37c7d0e..4c37df09cff 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -287,7 +287,8 @@ socket_close(int code, Datum arg)
 		 * not yet sent to the client.  (This is a flat-out violation of the
 		 * TCP RFCs, but count on Microsoft not to care about that.)  To get
 		 * the spec-compliant "graceful shutdown" behavior, we must invoke
-		 * closesocket() explicitly.
+		 * closesocket() explicitly.  When using OpenSSL, it seems that clean
+		 * shutdown also requires an explicit shutdown() call.
 		 *
 		 * This code runs late enough during process shutdown that we should
 		 * have finished all externally-visible shutdown activities, so that
@@ -295,6 +296,7 @@ socket_close(int code, Datum arg)
 		 * Windows too.  But it's a lot more fragile than the other way.
 		 */
 #ifdef WIN32
+		shutdown(MyProcPort->sock, SD_SEND);
 		closesocket(MyProcPort->sock);
 #endif
 


[parent: bba962f0c052]