# HG changeset patch # User Kim Alvefur # Date 1623080234 -7200 # Node ID 64cfa396bb844e13e59dd57d5a6f8966da466e3d # Parent e7a964572f6b8fef713a8b0d6068e112986e9d82 net.server_epoll: Fix reporting of socket connect timeout If the underlying TCP connection times out before the write timeout kicks in, end up here with err="timeout", which the following code treats as a minor issue. Then, due to epoll apparently returning the EPOLLOUT (writable) event too, we go on and try to write to the socket (commonly stream headers). This fails because the socket is closed, which becomes the error returned up the stack to the rest of Prosody. This also trips the 'onconnect' signal, which has effects on various things, such as the net.connect state machine. Probably undesirable effects. With this, we instead return "connection timeout", like server_event, and destroy the connection handle properly. And then nothing else happens because the connection has been destroyed. diff -r e7a964572f6b -r 64cfa396bb84 net/server_epoll.lua --- a/net/server_epoll.lua Thu May 27 09:22:07 2021 +0200 +++ b/net/server_epoll.lua Mon Jun 07 17:37:14 2021 +0200 @@ -416,6 +416,8 @@ elseif err == "wantwrite" then self:set(nil, true); err = "timeout"; + elseif err == "timeout" and not self._connected then + err = "connection timeout"; end if partial and partial ~= "" then self:onconnect();