25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00

remove deferred Collection shim header

This commit is contained in:
Christophe Romain 2015-04-21 16:11:00 +02:00
parent cbd45974e2
commit 61f80396da

View File

@ -3427,9 +3427,9 @@ broadcast_stanza(Host, _Node, _Nidx, _Type, NodeOptions, SubsByDepth, NotifyType
Stanza;
%% If there's only one SubID, don't add it
{true, [_]} ->
add_shim_headers(Stanza, collection_shim(NodeName));
Stnza;
{true, SubIDs} ->
add_shim_headers(Stanza, lists:append(collection_shim(NodeName), subid_shim(SubIDs)))
add_shim_headers(Stanza, subid_shim(SubIDs))
end,
lists:foreach(fun(To) ->
ejabberd_router:route(From, jlib:make_jid(To), StanzaToSend)
@ -4244,11 +4244,6 @@ add_headers(#xmlel{name = Name, attrs = Attrs, children = Els}, HeaderName, Head
#xmlel{name = Name, attrs = Attrs,
children = lists:append(Els, [HeaderEl])}.
collection_shim(Node) ->
[#xmlel{name = <<"header">>,
attrs = [{<<"name">>, <<"Collection">>}],
children = [{xmlcdata, Node}]}].
subid_shim(SubIds) ->
[#xmlel{name = <<"header">>,
attrs = [{<<"name">>, <<"SubId">>}],