From f765d7f61294e9cf9c5242152e34305d24fc9f60 Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Tue, 22 Nov 2005 18:00:56 +0000 Subject: [PATCH] * src/ejabberd_c2s.erl: Send stream error when connection is replaced (thanks to Maxim Ryazanov) SVN Revision: 440 --- ChangeLog | 9 +++++++-- src/ejabberd_c2s.erl | 7 +++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8782673f8..ff3363fba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ +2005-11-22 Alexey Shchepin + + * src/ejabberd_c2s.erl: Send stream error when connection is + replaced (thanks to Maxim Ryazanov) + 2005-11-19 Mickael Remond - * 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 diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index abc0cf670..64ac65d81 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -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,