summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2011-01-11 16:22:22 +0100
committerBadlop <badlop@process-one.net>2011-01-31 19:43:28 +0100
commit6ddc66db9f0ab2a366b7060c50b37bc3396502c9 (patch)
tree5051b9d156b8d38a94bcd5cd9a58afeba1183687 /src
parentmod_pres_counter prevents subscription flood (thanks to Ahmed Omar and Alexey... (diff)
Handle Tigase's unexpected version=1.0 when ejabberd doesn't announce it (EJAB-1379)
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_s2s_out.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index b07c9dcd..b9845e4f 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -316,6 +316,10 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
{"jabber:server", "jabber:server:dialback", true} when
StateData#state.use_v10 ->
{next_state, wait_for_features, StateData, ?FSMTIMEOUT};
+ %% Clause added to handle Tigase's workaround for an old ejabberd bug:
+ {"jabber:server", "jabber:server:dialback", true} when
+ not StateData#state.use_v10 ->
+ send_db_request(StateData);
{"jabber:server", "", true} when StateData#state.use_v10 ->
{next_state, wait_for_features, StateData#state{db_enabled = false}, ?FSMTIMEOUT};
{NSProvided, DB, _} ->