aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-12-11 15:37:35 +0100
committerKim Alvefur <zash@zash.se>2020-12-11 15:37:35 +0100
commitdc1efeb22dee5f93ce66252ddd1a25c097d1ee5b (patch)
treed60a14008227bcc7ce5fae4b8736592b4013b5a7 /plugins
parent8678cc2915c33c5fa426ed8157e76924748b08e4 (diff)
parentf4c821cc4ae1cd57fe88b5e579ee447ece44cdb4 (diff)
downloadprosody-dc1efeb22dee5f93ce66252ddd1a25c097d1ee5b.tar.gz
prosody-dc1efeb22dee5f93ce66252ddd1a25c097d1ee5b.zip
Merge 0.11->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_s2s.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/mod_s2s.lua b/plugins/mod_s2s.lua
index 0674f981..9fed6e0c 100644
--- a/plugins/mod_s2s.lua
+++ b/plugins/mod_s2s.lua
@@ -177,7 +177,10 @@ function route_to_new_session(event)
end
local function keepalive(event)
- return event.session.sends2s(' ');
+ local session = event.session;
+ if not session.notopen then
+ return event.session.send(' ');
+ end
end
module:hook("s2s-read-timeout", keepalive, -1);