aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-02 16:34:34 +0100
committerKim Alvefur <zash@zash.se>2016-03-02 16:34:34 +0100
commit0b702d28acf78831d94c75d4c239650ee1fe2c53 (patch)
tree503e8a7491dba1c841c729de3c74b2b63d529298 /net
parent8e521f441ea38df4156e4945c564c11fefbffd17 (diff)
parent70a7adc1c1340992b85b63c248fe913c199782e3 (diff)
downloadprosody-0b702d28acf78831d94c75d4c239650ee1fe2c53.tar.gz
prosody-0b702d28acf78831d94c75d4c239650ee1fe2c53.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r--net/server_event.lua15
1 files changed, 8 insertions, 7 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 67758664..7940a1b8 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -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