|
30 | 30 | * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group |
31 | 31 | * Portions Copyright (c) 1994, Regents of the University of California |
32 | 32 | * |
33 | | - *$Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.153 2003/05/15 16:35:28 momjian Exp $ |
| 33 | + *$Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.154 2003/05/29 19:15:34 tgl Exp $ |
34 | 34 | * |
35 | 35 | *------------------------------------------------------------------------- |
36 | 36 | */ |
@@ -149,9 +149,17 @@ pq_close(void) |
149 | 149 | { |
150 | 150 | if (MyProcPort!=NULL) |
151 | 151 | { |
| 152 | +/* Cleanly shut down SSL layer */ |
152 | 153 | secure_close(MyProcPort); |
153 | | -closesocket(MyProcPort->sock); |
154 | | -/* make sure any subsequent attempts to do I/O fail cleanly */ |
| 154 | +/* |
| 155 | + * Formerly we did an explicit close() here, but it seems better |
| 156 | + * to leave the socket open until the process dies. This allows |
| 157 | + * clients to perform a "synchronous close" if they care --- wait |
| 158 | + * till the transport layer reports connection closure, and you |
| 159 | + * can be sure the backend has exited. |
| 160 | + * |
| 161 | + * We do set sock to -1 to prevent any further I/O, though. |
| 162 | + */ |
155 | 163 | MyProcPort->sock=-1; |
156 | 164 | } |
157 | 165 | } |
@@ -470,6 +478,13 @@ StreamConnection(int server_fd, Port *port) |
470 | 478 |
|
471 | 479 | /* |
472 | 480 | * StreamClose -- close a client/backend connection |
| 481 | + * |
| 482 | + * NOTE: this is NOT used to terminate a session; it is just used to release |
| 483 | + * the file descriptor in a process that should no longer have the socket |
| 484 | + * open. (For example, the postmaster calls this after passing ownership |
| 485 | + * of the connection to a child process.) It is expected that someone else |
| 486 | + * still has the socket open. So, we only want to close the descriptor, |
| 487 | + * we do NOT want to send anything to the far end. |
473 | 488 | */ |
474 | 489 | void |
475 | 490 | StreamClose(intsock) |
|