yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-04 18:29:20 +02:00
Code Issues Releases Wiki Activity

XEP-0198: Fix session timeout corner case

Browse source 
If the "resend_on_timeout" option is set to 'if_offline' and a pending
stream management session is terminated because a new session is opened
by the same resource (while no other resource is online), resend
unacknowledged messages rather than bouncing error messages.
This commit is contained in:
Holger Weiss 2016-02-06 22:28:55 +01:00
parent 7435ee464f
commit a31f59ea31
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ejabberd_c2s.erl
View file

@ -2833,8 +2833,16 @@ handle_unacked_stanzas(StateData)
Resend when is_boolean(Resend) -> Resend when is_boolean(Resend) ->
Resend; Resend;
if_offline -> if_offline ->
ejabberd_sm:get_user_resources(StateData#state.user, Resource = StateData#state.resource,
StateData#state.server) == [] case ejabberd_sm:get_user_resources(StateData#state.user,
StateData#state.server) of
[Resource] -> % Same resource opened new session
true;
[] ->
true;
_ ->
false
end
end, end,
ReRoute = case ResendOnTimeout of ReRoute = case ResendOnTimeout of
true -> true ->