Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit ed52c37

Browse files
committed
On Windows, also call shutdown() while closing the client socket.
Further experimentation shows that commit 6051857 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
1 parent bba962f commit ed52c37

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/backend/libpq/pqcomm.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,16 @@ socket_close(int code, Datum arg)
287287
* not yet sent to the client. (This is a flat-out violation of the
288288
* TCP RFCs, but count on Microsoft not to care about that.) To get
289289
* the spec-compliant "graceful shutdown" behavior, we must invoke
290-
* closesocket() explicitly.
290+
* closesocket() explicitly. When using OpenSSL, it seems that clean
291+
* shutdown also requires an explicit shutdown() call.
291292
*
292293
* This code runs late enough during process shutdown that we should
293294
* have finished all externally-visible shutdown activities, so that
294295
* in principle it's good enough to act as a synchronous close on
295296
* Windows too. But it's a lot more fragile than the other way.
296297
*/
297298
#ifdef WIN32
299+
shutdown(MyProcPort->sock, SD_SEND);
298300
closesocket(MyProcPort->sock);
299301
#endif
300302

0 commit comments

Comments
 (0)