Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-22 22:23:42 +02:00
Code Releases Activity

Fixed error replying on blocked messages

Browse Source
This commit is contained in:
Alexey Shchepin 2015-04-20 17:01:56 +03:00
parent e8576c23c5
commit fd54181435
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ejabberd_c2s.erl
View File

@ -1680,11 +1680,16 @@ handle_info({route, From, To,
of
allow -> {true, Attrs, StateData};
deny ->
case xml:get_attr_s(<<"type">>, Attrs) of
<<"error">> -> ok;
<<"result">> -> ok;
_ ->
Err =
jlib:make_error_reply(Packet,
?ERR_SERVICE_UNAVAILABLE),
ejabberd_router:route(To, From,
Err),
Err)
end,
{false, Attrs, StateData}
end;
_ -> {true, Attrs, StateData}
@ -2177,7 +2182,8 @@ check_privacy_route(From, StateData, FromRoute, To,
"the routing of this stanza.">>,
Err = jlib:make_error_reply(Packet,
?ERRT_NOT_ACCEPTABLE(Lang, ErrText)),
ejabberd_router:route(To, From, Err),
Err2 = jlib:replace_from_to(To, From, Err),
send_element(StateData, Err2),
ok;
allow -> ejabberd_router:route(FromRoute, To, Packet)
end.