mirror of
https://github.com/processone/ejabberd.git
synced 2025-01-03 18:02:28 +01:00
* src/ejabberd_c2s.erl: Send stream error when connection is
replaced (thanks to Maxim Ryazanov) SVN Revision: 440
This commit is contained in:
parent
daba3b2012
commit
f765d7f612
@ -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>
|
2005-11-19 Mickael Remond <mickael.remond@process-one.net>
|
||||||
|
|
||||||
* contrib/extract_translations/prepare-translation.sh: Added wrapper to
|
* contrib/extract_translations/prepare-translation.sh: Added
|
||||||
extract_translation.erl (thanks to Badlod).
|
wrapper to extract_translation.erl (thanks to Badlop)
|
||||||
|
|
||||||
2005-11-19 Alexey Shchepin <alexey@sevcom.net>
|
2005-11-19 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
|
@ -832,8 +832,11 @@ handle_info({send_text, Text}, StateName, StateData) ->
|
|||||||
send_text(StateData, Text),
|
send_text(StateData, Text),
|
||||||
{next_state, StateName, StateData};
|
{next_state, StateName, StateData};
|
||||||
handle_info(replaced, _StateName, StateData) ->
|
handle_info(replaced, _StateName, StateData) ->
|
||||||
% TODO
|
Lang = StateData#state.lang,
|
||||||
%send_text(StateData#state.sender, Text),
|
send_text(StateData,
|
||||||
|
xml:element_to_string(
|
||||||
|
?SERRT_CONFLICT(Lang, "Replaced by new connection"))
|
||||||
|
++ ?STREAM_TRAILER),
|
||||||
{stop, normal, StateData#state{authenticated = replaced}};
|
{stop, normal, StateData#state{authenticated = replaced}};
|
||||||
handle_info({route, From, To, Packet}, StateName, StateData) ->
|
handle_info({route, From, To, Packet}, StateName, StateData) ->
|
||||||
{xmlelement, Name, Attrs, Els} = Packet,
|
{xmlelement, Name, Attrs, Els} = Packet,
|
||||||
|
Loading…
Reference in New Issue
Block a user