mirror of
https://github.com/processone/ejabberd.git
synced 2024-07-19 00:11:01 +02:00
Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test
Conflicts: src/ejabberd_c2s.erl src/mod_offline.erl src/mod_offline_odbc.erl
This commit is contained in:
commit
00d8b2ac30
|
@ -555,7 +555,7 @@ wait_for_auth({xmlstreamelement, El}, StateData) ->
|
||||||
privacy_get_user_list, StateData#state.server,
|
privacy_get_user_list, StateData#state.server,
|
||||||
#userlist{},
|
#userlist{},
|
||||||
[U, StateData#state.server]),
|
[U, StateData#state.server]),
|
||||||
NewStateData = StateData#state{
|
NewStateData = StateData#state{
|
||||||
user = U,
|
user = U,
|
||||||
resource = R,
|
resource = R,
|
||||||
jid = JID,
|
jid = JID,
|
||||||
|
|
|
@ -92,7 +92,8 @@ process_data(CallbackPid, Stack, Data) ->
|
||||||
[{xmlelement, Name, Attrs, Els} | Tail] ->
|
[{xmlelement, Name, Attrs, Els} | Tail] ->
|
||||||
[{xmlelement, Name, Attrs, [{xmlcdata, CData} | Els]} |
|
[{xmlelement, Name, Attrs, [{xmlcdata, CData} | Els]} |
|
||||||
Tail];
|
Tail];
|
||||||
[] -> []
|
[] ->
|
||||||
|
[]
|
||||||
end;
|
end;
|
||||||
{?XML_ERROR, Err} ->
|
{?XML_ERROR, Err} ->
|
||||||
catch gen_fsm:send_event(CallbackPid, {xmlstreamerror, Err})
|
catch gen_fsm:send_event(CallbackPid, {xmlstreamerror, Err})
|
||||||
|
|
Loading…
Reference in New Issue
Block a user