From 3e4858f348bc9090bb58e28bce96ad805fe3502f Mon Sep 17 00:00:00 2001 From: Badlop Date: Fri, 15 Jan 2010 12:01:12 +0000 Subject: [PATCH] Improve functions calls when closing client connection. SVN Revision: 2904 --- src/ejabberd_c2s.erl | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index ddb9e867d..ff3c5f6e4 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1306,17 +1306,15 @@ handle_info({'DOWN', Monitor, _Type, _Object, _Info}, _StateName, StateData) {stop, normal, StateData}; handle_info(system_shutdown, StateName, StateData) -> case StateName of - wait_for_stream -> - Header = io_lib:format(?STREAM_HEADER, - ["none", ?MYNAME, " version='1.0'", ""]), - send_text(StateData, Header), - send_element(StateData, ?SERR_SYSTEM_SHUTDOWN), - send_text(StateData, ?STREAM_TRAILER), - ok; - _ -> - send_element(StateData, ?SERR_SYSTEM_SHUTDOWN), - send_text(StateData, ?STREAM_TRAILER), - ok + wait_for_stream -> + send_header(StateData, ?MYNAME, "1.0", "en"), + send_element(StateData, ?SERR_SYSTEM_SHUTDOWN), + send_trailer(StateData), + ok; + _ -> + send_element(StateData, ?SERR_SYSTEM_SHUTDOWN), + send_trailer(StateData), + ok end, {stop, normal, StateData}; handle_info(Info, StateName, StateData) ->