Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

* src/ejabberd_c2s.erl: Send stream error when connection is 

replaced (thanks to Maxim Ryazanov)

SVN Revision: 440
This commit is contained in:
Alexey Shchepin 2005-11-22 18:00:56 +00:00
parent daba3b2012
commit f765d7f612
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,7 +1,12 @@
2005-11-22 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_c2s.erl: Send stream error when connection is
replaced (thanks to Maxim Ryazanov)
2005-11-19 Mickael Remond <mickael.remond@process-one.net>
* contrib/extract_translations/prepare-translation.sh: Added wrapper to
extract_translation.erl (thanks to Badlod).
* contrib/extract_translations/prepare-translation.sh: Added
wrapper to extract_translation.erl (thanks to Badlop)
2005-11-19 Alexey Shchepin <alexey@sevcom.net>

7
src/ejabberd_c2s.erl
View File

@ -832,8 +832,11 @@ handle_info({send_text, Text}, StateName, StateData) ->
send_text(StateData, Text),
{next_state, StateName, StateData};
handle_info(replaced, _StateName, StateData) ->
% TODO
%send_text(StateData#state.sender, Text),
Lang = StateData#state.lang,
send_text(StateData,
xml:element_to_string(
?SERRT_CONFLICT(Lang, "Replaced by new connection"))
++ ?STREAM_TRAILER),
{stop, normal, StateData#state{authenticated = replaced}};
handle_info({route, From, To, Packet}, StateName, StateData) ->
{xmlelement, Name, Attrs, Els} = Packet,