Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-02 16:37:52 +01:00
Code Releases Activity

Merge r1666 from trunk:

Browse Source 
* 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
This commit is contained in:
Badlop 2009-02-21 09:12:59 +00:00
parent f362fe93ec
commit 677387bc80
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-02-21 Badlop <badlop@process-one.net>
* 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 <christophe.romain@process-one.net> 2009-02-19 Christophe Romain <christophe.romain@process-one.net>
* src/mod_pubsub/mod_pubsub.erl: fix nodetree plugin resolver * src/mod_pubsub/mod_pubsub.erl: fix nodetree plugin resolver

2
src/ejabberd_c2s.erl
View File

@ -1171,7 +1171,7 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
NewPL -> NewPL ->
PrivPushIQ = PrivPushIQ =
#iq{type = set, xmlns = ?NS_PRIVACY, #iq{type = set, xmlns = ?NS_PRIVACY,
id = "push", id = "push" ++ randoms:get_string(),
sub_el = [{xmlelement, "query", sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_PRIVACY}], [{"xmlns", ?NS_PRIVACY}],
[{xmlelement, "list", [{xmlelement, "list",

2
src/mod_roster.erl
View File

@ -371,7 +371,7 @@ push_item(User, Server, Resource, _From, Item) ->
push_item(User, Server, Resource, From, Item) -> push_item(User, Server, Resource, From, Item) ->
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER, ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
id = "push", id = "push" ++ randoms:get_string(),
sub_el = [{xmlelement, "query", sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}], [{"xmlns", ?NS_ROSTER}],
[item_to_xml(Item)]}]}, [item_to_xml(Item)]}]},

2
src/mod_roster_odbc.erl
View File

@ -407,7 +407,7 @@ push_item(User, Server, Resource, _From, Item) ->
push_item(User, Resource, From, Item) -> push_item(User, Resource, From, Item) ->
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER, ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
id = "push", id = "push" ++ randoms:get_string(),
sub_el = [{xmlelement, "query", sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}], [{"xmlns", ?NS_ROSTER}],
[item_to_xml(Item)]}]}, [item_to_xml(Item)]}]},

4
src/mod_shared_roster.erl
View File

@ -248,7 +248,7 @@ set_new_rosteritems(UserFrom, ServerFrom,
set_item(User, Server, Resource, Item) -> set_item(User, Server, Resource, Item) ->
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER, ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
id = "push", id = "push" ++ randoms:get_string(),
sub_el = [{xmlelement, "query", sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}], [{"xmlns", ?NS_ROSTER}],
[mod_roster:item_to_xml(Item)]}]}, [mod_roster:item_to_xml(Item)]}]},
@ -617,7 +617,7 @@ push_item(User, Server, From, Item) ->
Item#roster.subscription}]}), Item#roster.subscription}]}),
Stanza = jlib:iq_to_xml( Stanza = jlib:iq_to_xml(
#iq{type = set, xmlns = ?NS_ROSTER, #iq{type = set, xmlns = ?NS_ROSTER,
id = "push", id = "push" ++ randoms:get_string(),
sub_el = [{xmlelement, "query", sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}], [{"xmlns", ?NS_ROSTER}],
[item_to_xml(Item)]}]}), [item_to_xml(Item)]}]}),