aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-08-10 20:47:40 +0200
committerKim Alvefur <zash@zash.se>2016-08-10 20:47:40 +0200
commit07e243fa97c426e4dee03dbdcb063d467f9bf012 (patch)
treeced46a97c6916344813b5dcef4b8bb33536fb7a8
parente06f1294be5799b2bb70d8c3b5f2ad5816a2bc0d (diff)
downloadprosody-07e243fa97c426e4dee03dbdcb063d467f9bf012.tar.gz
prosody-07e243fa97c426e4dee03dbdcb063d467f9bf012.zip
net.server_epoll: Remove last traces of code for bypassing buffering on writable sockets
-rw-r--r--net/server_epoll.lua10
1 files changed, 2 insertions, 8 deletions
diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index bfe5f18f..9808b8ea 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -253,14 +253,12 @@ function interface:onwriteable()
else
self:setwritetimeout();
end
- self._writable = true;
elseif partial then
buffer[1] = data:sub(partial+1)
for i = #buffer, 2, -1 do
buffer[i] = nil;
end
self:setwritetimeout();
- self._writable = false;
end
if err == "wantwrite" or err == "timeout" then
self:setflags(nil, true);
@@ -290,12 +288,8 @@ function interface:write(data)
else
self.writebuffer = { data };
end
- if self._writable and false then
- self:onwriteable();
- else
- self:setwritetimeout();
- self:setflags(nil, true);
- end
+ self:setwritetimeout();
+ self:setflags(nil, true);
return #data;
end
interface.send = interface.write;