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.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2021-04-10 16:45:44 +02:00
commit 7c5659808a
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/mod_c2s.lua
View file

@ -210,12 +210,12 @@ local function session_close(session, reason)
if not session.destroyed then
session.log("warn", "Failed to receive a stream close response, closing connection anyway...");
sm_destroy_session(session, reason_text);
conn:close();
if conn then conn:close(); end
end
end);
else
sm_destroy_session(session, reason_text);
conn:close();
if conn then conn:close(); end
end
else
local reason_text = (reason and (reason.name or reason.text or reason.condition)) or reason;
@ -246,11 +246,19 @@ module:hook_global("user-password-changed", function(event)
end, 200);
function runner_callbacks:ready()
self.data.conn:resume();
if self.data.conn then
self.data.conn:resume();
else
(self.data.log or log)("debug", "Session has no connection to resume");
end
end
function runner_callbacks:waiting()
self.data.conn:pause();
if self.data.conn then
self.data.conn:pause();
else
(self.data.log or log)("debug", "Session has no connection to pause while waiting");
end
end
function runner_callbacks:error(err)