diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2005-11-22 18:00:56 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2005-11-22 18:00:56 +0000 |
| commit | f765d7f61294e9cf9c5242152e34305d24fc9f60 (patch) | |
| tree | 025f0773e3be84aac9fc7c1fdaaf22946bcd6f7c | |
| parent | Added prepare-translation.sh wrapper to extract_translation.erl (Thanks to Ba... (diff) | |
* src/ejabberd_c2s.erl: Send stream error when connection is
replaced (thanks to Maxim Ryazanov)
SVN Revision: 440
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/ejabberd_c2s.erl | 7 |
2 files changed, 12 insertions, 4 deletions
@@ -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> 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, |