From 837a94a53f73abe603360d7089c54a855dd52d3e Mon Sep 17 00:00:00 2001
From: wenceslao <numorb@gmail.com>
Date: Tue, 22 Sep 2026 08:52:17 +0200
Subject: [PATCH] fix: flush the closing reply (464/ERROR) before closing the
 socket

---
 srcs/server/Server.cpp | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/srcs/server/Server.cpp b/srcs/server/Server.cpp
index 1db2f8b..0da1309 100644
--- a/srcs/server/Server.cpp
+++ b/srcs/server/Server.cpp
@@ -137,6 +137,17 @@ void Server::processClientSockets_() {
             sockets_.flushWriteBuffer(pfd.fd);
         setPolloutInterest_(pfd.fd);
 
+        // Client already removed (QUIT, wrong password): its 464/ERROR was
+        // still queued. Close once it is sent, or if the peer is gone.
+        if (!clients_.find(pfd.fd)) {
+            if (!sockets_.hasPendingWrite(pfd.fd) ||
+                (pfd.revents & (POLLERR | POLLHUP))) {
+                removeClientSocketPfd_(pfd.fd);
+                --idx;
+            }
+            continue;
+        }
+
         if (!(pfd.revents & (POLLIN | POLLERR | POLLHUP)))
             continue;
 
@@ -194,8 +205,16 @@ void Server::processClientSockets_() {
         };
 
         if (closeData.closeSocket) {
-            removeClientSocketPfd_(pfd.fd, closeData.closeMsg);
-            --idx;
+            if (closeData.closeMsg.empty() &&
+                sockets_.hasPendingWrite(pfd.fd)) {
+                // handler asked to close: keep the fd for POLLOUT only until
+                // its pending output is sent (see the top of this loop)
+                pfd.events = static_cast<short>(POLLOUT);
+                clients_.remove(pfd.fd, channels_);
+            } else {
+                removeClientSocketPfd_(pfd.fd, closeData.closeMsg);
+                --idx;
+            }
         }
     }
 }
@@ -215,10 +234,6 @@ void Server::removeClientSocketPfd_(int const fd, std::string const &msg) {
         }
         clients_.remove(fd, channels_);
     }
-    // TODO: socket is closed without flush. So loop cannot send the message
-    // Fix line below :
-    // sockets_.flushWriteBuffer(fd);
-    // But, is it okay to flush without checking POLLOUT here?
     sockets_.closeSocket(fd);
     removePollFd_(fd);
 }