aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-10-04 16:39:57 +0100
committerMatthew Wild <mwild1@gmail.com>2009-10-04 16:39:57 +0100
commita49eec37941ee416e83ed60c16e94dbb7d14f24d (patch)
treed18d5c68aaf39d68ffa257712be48970ba63636e
parentae0f4f94aa8707f803cc31395187d84853c33b68 (diff)
downloadprosody-a49eec37941ee416e83ed60c16e94dbb7d14f24d.tar.gz
prosody-a49eec37941ee416e83ed60c16e94dbb7d14f24d.zip
s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
-rw-r--r--core/s2smanager.lua11
1 files changed, 7 insertions, 4 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 78f9ed9c..e49c3f93 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -384,10 +384,13 @@ function streamopened(session, attr)
end
session.send_buffer = nil;
- if not session.dialback_verifying then
- initiate_dialback(session);
- else
- mark_connected(session);
+ -- If server is pre-1.0, don't wait for features, just do dialback
+ if session.version < 1.0 then
+ if not session.dialback_verifying then
+ initiate_dialback(session);
+ else
+ mark_connected(session);
+ end
end
end