aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-12-28 14:26:21 +0100
committerKim Alvefur <zash@zash.se>2012-12-28 14:26:21 +0100
commita79da674d1e5ff1b7a2926294c3d141fabbad294 (patch)
treed8eca2adc76e5ad66f15e35eeaeff14df934c2cb
parentafd25ad763e144ae93209b2aab9540b9ec45abcb (diff)
downloadprosody-a79da674d1e5ff1b7a2926294c3d141fabbad294.tar.gz
prosody-a79da674d1e5ff1b7a2926294c3d141fabbad294.zip
net.server_event: Destroy interfaces immediately, fixes reopening of servers.
-rw-r--r--net/server_event.lua10
1 files changed, 2 insertions, 8 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 5316866e..e69530ff 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -120,14 +120,8 @@ do
self.position = new_position or self.position
return self.position;
end
- function interface_mt:_close() -- regs event to start self:_destroy()
- local callback = function( )
- self:_destroy();
- self.eventclose = nil
- return -1
- end
- self.eventclose = addevent( base, nil, EV_TIMEOUT, callback, 0 )
- return true
+ function interface_mt:_close()
+ return self:_destroy();
end
function interface_mt:_start_connection(plainssl) -- should be called from addclient