Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Revert "Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test"

Browse Source 
This reverts commit 00d8b2ac30, reversing
changes made to cac23c39c9.
This commit is contained in:
Alexey Shchepin 2010-10-19 13:52:17 +03:00
parent 426b7ca769
commit 8d69d4aaba
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ejabberd_c2s.erl
View File

@ -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,

3
src/xml_stream.erl
View File

@ -92,8 +92,7 @@ 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})