[BUG] stream_sock: always shutdown(SHUT_WR) before closing

When we close a socket with unread data in the buffer, or when the
nolinger option is set, we regularly lose the last fragment, which
often contains the error message. This typically occurs when sending
too large a request. Only the RST is seen due to the close() (since
not all data were read) and the output message never reaches the
network.

Doing a shutdown() before the close() solves this annoying issue
because the data are really pushed before the system sends the RST.
(cherry picked from commit 720058cdcbd5285dc4e4a48216b10c9b96000141)

diff --git a/src/stream_sock.c b/src/stream_sock.c
index 82bf8caf662e76e55984b68fd3ef6c11c3023cb8..80d4996a72bbbb17361094cbbef07e5bdbcaf8e9 100644 (file)
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -787,11 +787,16 @@ void stream_sock_shutw(struct stream_interface *si)
 
        switch (si->state) {
        case SI_ST_EST:
-               if (!(si->ib->flags & BF_SHUTR)) {
-                       EV_FD_CLR(si->fd, DIR_WR);
-                       shutdown(si->fd, SHUT_WR);
+               /* we have to shut before closing, otherwise some short messages
+                * may never leave the system, especially when there are remaining
+                * unread data in the socket input buffer, or when nolinger is set.
+                */
+               EV_FD_CLR(si->fd, DIR_WR);
+               shutdown(si->fd, SHUT_WR);
+
+               if (!(si->ib->flags & BF_SHUTR))
                        return;
-               }
+
                /* fall through */
        case SI_ST_CON:
                /* we may have to close a pending connection, and mark the