diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-02-18 16:46:07 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-02-18 16:46:07 +0000 |
| commit | 80952e2cc9c13df0a8a9ea572326f82285b05141 (patch) | |
| tree | 4cd0d2ec4c7c03553ce9ae55132d85802f2bced9 /net/server_event.lua | |
| parent | 4aaa16aa23eb1fa887dd27e6286b05dd557054e5 (diff) | |
| parent | f2a5185e0074e220759ccc35ca897d6d948cb219 (diff) | |
| download | prosody-80952e2cc9c13df0a8a9ea572326f82285b05141.tar.gz prosody-80952e2cc9c13df0a8a9ea572326f82285b05141.zip | |
Merge with 0.7
Diffstat (limited to 'net/server_event.lua')
| -rw-r--r-- | net/server_event.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 610c2e7a..3456fb9e 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -262,7 +262,7 @@ do _ = self.eventsession and self.eventsession:close( ) _ = self.eventwritetimeout and self.eventwritetimeout:close( ) _ = self.eventreadtimeout and self.eventreadtimeout:close( ) - _ = self.ondisconnect and self:ondisconnect( self.fatalerror ) -- call ondisconnect listener (wont be the case if handshake failed on connect) + _ = self.ondisconnect and self:ondisconnect( self.fatalerror ~= "client to close" and self.fatalerror) -- call ondisconnect listener (wont be the case if handshake failed on connect) _ = self.conn and self.conn:close( ) -- close connection, must also be called outside of any socket registered events! _ = self._server and self._server:counter(-1); self.eventread, self.eventwrite = nil, nil |