24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-10 21:47:01 +02:00

Merge remote-tracking branch 'processone/pr/3506'

* processone/pr/3506:
  Remove queryid from MAM fin element
This commit is contained in:
Holger Weiss 2021-01-29 19:25:40 +01:00
commit 58e28e82bb

View File

@ -1286,9 +1286,11 @@ send(Msgs, Count, IsComplete,
RSMOut = make_rsm_out(Msgs, Count), RSMOut = make_rsm_out(Msgs, Count),
Result = if NS == ?NS_MAM_TMP -> Result = if NS == ?NS_MAM_TMP ->
#mam_query{xmlns = NS, id = QID, rsm = RSMOut}; #mam_query{xmlns = NS, id = QID, rsm = RSMOut};
true -> NS == ?NS_MAM_0 ->
#mam_fin{xmlns = NS, id = QID, rsm = RSMOut, #mam_fin{xmlns = NS, id = QID, rsm = RSMOut,
complete = IsComplete} complete = IsComplete}
true ->
#mam_fin{xmlns = NS, rsm = RSMOut, complete = IsComplete}
end, end,
if NS /= ?NS_MAM_0 -> if NS /= ?NS_MAM_0 ->
lists:foreach( lists:foreach(