From: Badlop Date: Sat, 21 Feb 2009 09:12:59 +0000 (+0000) Subject: Merge r1666 from trunk: X-Git-Tag: v2.0.5~40 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=677387bc8072b8930e6b891b5a3e61730bae1efa;p=ejabberd Merge r1666 from trunk: * src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721) * src/mod_roster.erl: Likewise * src/mod_roster_odbc.erl: Likewise * src/mod_shared_roster.erl: Likewise SVN Revision: 1894 --- diff --git a/ChangeLog b/ChangeLog index a9a394c74..b2a1c43bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-02-21 Badlop + + * src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721) + * src/mod_roster.erl: Likewise + * src/mod_roster_odbc.erl: Likewise + * src/mod_shared_roster.erl: Likewise + 2009-02-19 Christophe Romain * src/mod_pubsub/mod_pubsub.erl: fix nodetree plugin resolver diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 8407d976b..8e624612d 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1171,7 +1171,7 @@ handle_info({route, From, To, Packet}, StateName, StateData) -> NewPL -> PrivPushIQ = #iq{type = set, xmlns = ?NS_PRIVACY, - id = "push", + id = "push" ++ randoms:get_string(), sub_el = [{xmlelement, "query", [{"xmlns", ?NS_PRIVACY}], [{xmlelement, "list", diff --git a/src/mod_roster.erl b/src/mod_roster.erl index 9f2e85c6d..278602b8e 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -371,7 +371,7 @@ push_item(User, Server, Resource, _From, Item) -> push_item(User, Server, Resource, From, Item) -> ResIQ = #iq{type = set, xmlns = ?NS_ROSTER, - id = "push", + id = "push" ++ randoms:get_string(), sub_el = [{xmlelement, "query", [{"xmlns", ?NS_ROSTER}], [item_to_xml(Item)]}]}, diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl index fa428da9f..90483cf95 100644 --- a/src/mod_roster_odbc.erl +++ b/src/mod_roster_odbc.erl @@ -407,7 +407,7 @@ push_item(User, Server, Resource, _From, Item) -> push_item(User, Resource, From, Item) -> ResIQ = #iq{type = set, xmlns = ?NS_ROSTER, - id = "push", + id = "push" ++ randoms:get_string(), sub_el = [{xmlelement, "query", [{"xmlns", ?NS_ROSTER}], [item_to_xml(Item)]}]}, diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl index af123c2a5..7ca154947 100644 --- a/src/mod_shared_roster.erl +++ b/src/mod_shared_roster.erl @@ -248,7 +248,7 @@ set_new_rosteritems(UserFrom, ServerFrom, set_item(User, Server, Resource, Item) -> ResIQ = #iq{type = set, xmlns = ?NS_ROSTER, - id = "push", + id = "push" ++ randoms:get_string(), sub_el = [{xmlelement, "query", [{"xmlns", ?NS_ROSTER}], [mod_roster:item_to_xml(Item)]}]}, @@ -617,7 +617,7 @@ push_item(User, Server, From, Item) -> Item#roster.subscription}]}), Stanza = jlib:iq_to_xml( #iq{type = set, xmlns = ?NS_ROSTER, - id = "push", + id = "push" ++ randoms:get_string(), sub_el = [{xmlelement, "query", [{"xmlns", ?NS_ROSTER}], [item_to_xml(Item)]}]}),