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

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2019-03-28 17:28:20 +01:00
commit e1d1f3d4f7
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
net/server_epoll.lua
View file

@ -340,22 +340,25 @@ function interface:onreadable()
self:onconnect();
self:on("incoming", data);
else
if err == "wantread" then
self:set(true, nil);
err = "timeout";
elseif err == "wantwrite" then
self:set(nil, true);
err = "timeout";
end
if partial and partial ~= "" then
self:onconnect();
self:on("incoming", partial, err);
end
if err == "wantread" then
self:set(true, nil);
elseif err == "wantwrite" then
self:set(nil, true);
elseif err ~= "timeout" then
if err ~= "timeout" then
self:on("disconnect", err);
self:destroy()
return;
end
end
if not self.conn then return; end
if self.conn:dirty() then
if self._wantread and self.conn:dirty() then
self:setreadtimeout(false);
self:pausefor(cfg.read_retry_delay);
else