net.server_epoll: Fix reporting of socket connect timeout
authorKim Alvefur <zash@zash.se>
Mon, 07 Jun 2021 17:37:14 +0200
changeset 11596 64cfa396bb84
parent 11595 e7a964572f6b
child 11597 0db763f3f3be
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.
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();