mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.server_epoll: Propagate returns from opportunistic writes

Browse source 
So that if a write ends up writing directly to the socket, it gets the
actual return value
This commit is contained in:
Kim Alvefur 2021-07-16 01:21:05 +02:00
parent c611398c1f
commit 8318977ef4
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
net/server_epoll.lua
View file

@ -477,7 +477,7 @@ function interface:onwritable()
end end
self:setwritetimeout(false); self:setwritetimeout(false);
self:ondrain(); -- Be aware of writes in ondrain self:ondrain(); -- Be aware of writes in ondrain
return; return ok;
elseif partial then elseif partial then
self:debug("Sent %d out of %d buffered bytes", partial, #data); self:debug("Sent %d out of %d buffered bytes", partial, #data);
buffer[1] = data:sub(partial+1); buffer[1] = data:sub(partial+1);
@ -494,6 +494,7 @@ function interface:onwritable()
elseif err ~= "timeout" then elseif err ~= "timeout" then
self:on("disconnect", err); self:on("disconnect", err);
self:destroy(); self:destroy();
return ok, err;
end end
end end
@ -513,9 +514,9 @@ function interface:write(data)
if not self._write_lock then if not self._write_lock then
if cfg.opportunistic_writes and not self._opportunistic_write then if cfg.opportunistic_writes and not self._opportunistic_write then
self._opportunistic_write = true; self._opportunistic_write = true;
self:onwritable(); local ret, err = self:onwritable();
self._opportunistic_write = nil; self._opportunistic_write = nil;
return #data; return ret, err;
end end
self:setwritetimeout(); self:setwritetimeout();
self:set(nil, true); self:set(nil, true);