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

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2016-03-02 16:34:34 +01:00
commit 0b702d28ac
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
net/server_event.lua
View file

@ -238,8 +238,8 @@ function interface_mt:_destroy() -- close this interface + events and call last
end
function interface_mt:_lock(nointerface, noreading, nowriting) -- lock or unlock this interface or events
self.nointerface, self.noreading, self.nowriting = nointerface, noreading, nowriting
return nointerface, noreading, nowriting
self.nointerface, self.noreading, self.nowriting = nointerface, noreading, nowriting
return nointerface, noreading, nowriting
end
--TODO: Deprecate
@ -257,8 +257,9 @@ end
function interface_mt:resume()
self:_lock(self.nointerface, false, self.nowriting);
if not self.eventread then
if self.readcallback and not self.eventread then
self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT ); -- register callback
return true;
end
end
@ -740,7 +741,7 @@ end
local function newevent( ... )
return addevent( base, ... )
end
end
local function closeallservers ( arg )
for item in pairs( interfacelist ) do
@ -752,9 +753,9 @@ end
local function setquitting(yes)
if yes then
-- Quit now
closeallservers();
base:loopexit();
-- Quit now
closeallservers();
base:loopexit();
end
end