aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-06-09 12:09:48 +0000
committerBadlop <badlop@process-one.net>2009-06-09 12:09:48 +0000
commitce7e9129d992d78532eddb19a3c9dcd38f0e3e28 (patch)
tree1b8c5a0b5edd78c2d95b6cd28fca9b8e1bd33f6d
parentAdd forgotten copyright and license notices. Fix blackspaces. (diff)
When client is closed, include the Reason in the stream trailer stanza.
SVN Revision: 2153
-rw-r--r--src/ejabberd_c2s.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 6b8add66a..6567d909d 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1263,7 +1263,12 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
end,
if
Pass == exit ->
- catch send_text(StateData, ?STREAM_TRAILER),
+ %% When Pass==exit, NewState contains a string instead of a #state{}
+ Lang = StateData#state.lang,
+ catch send_text(StateData,
+ xml:element_to_string(
+ ?SERRT_CONFLICT(Lang, NewState))
+ ++ ?STREAM_TRAILER),
{stop, normal, StateData};
Pass ->
Attrs2 = jlib:replace_from_to_attrs(jlib:jid_to_string(From),