diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-04-27 00:28:42 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-04-27 00:28:42 +0200 |
| commit | eabca827652ebf2d9cc99d49a1eb3292a74fb5e5 (patch) | |
| tree | 8df5920902dad3b654c34e9d5897a0a1d4a435c1 | |
| parent | Merge pull request #176 from hamano/devel (diff) | |
Send stream trailer before closing s2s connection
When aborting an incoming s2s connection due to certificate verification
errors, send a stream trailer before closing the socket.
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 3eb0b71cc..aa55c2e63 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -294,8 +294,9 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, ?INFO_MSG("Closing s2s connection: ~s <--> ~s (~s)", [StateData#state.server, RemoteServer, CertError]), send_text(StateData, - xml:element_to_binary(?SERRT_POLICY_VIOLATION(<<"en">>, - CertError))), + <<(xml:element_to_binary(?SERRT_POLICY_VIOLATION(<<"en">>, + CertError)))/binary, + (?STREAM_TRAILER)/binary>>), {atomic, Pid} = ejabberd_s2s:find_connection(jlib:make_jid(<<"">>, Server, <<"">>), |