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

Merge branch 'master' of github.com:processone/ejabberd

Browse Source
This commit is contained in:
Mickael Remond 2015-09-02 17:02:20 +02:00
commit a85a8dff45
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/idna.erl → src/ejabberd_idna.erl
View File

@ -1,5 +1,5 @@
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
%%% File : idna.erl %%% File : ejabberd_idna.erl
%%% Author : Alexey Shchepin <alexey@process-one.net> %%% Author : Alexey Shchepin <alexey@process-one.net>
%%% Purpose : Support for IDNA (RFC3490) %%% Purpose : Support for IDNA (RFC3490)
%%% Created : 10 Apr 2004 by Alexey Shchepin <alexey@process-one.net> %%% Created : 10 Apr 2004 by Alexey Shchepin <alexey@process-one.net>
@ -23,7 +23,7 @@
%%% %%%
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
-module(idna). -module(ejabberd_idna).
-author('alexey@process-one.net'). -author('alexey@process-one.net').

4
src/ejabberd_s2s.erl
View File

@ -225,7 +225,7 @@ check_peer_certificate(SockMod, Sock, Peer) ->
{ok, Cert} -> {ok, Cert} ->
case SockMod:get_verify_result(Sock) of case SockMod:get_verify_result(Sock) of
0 -> 0 ->
case idna:domain_utf8_to_ascii(Peer) of case ejabberd_idna:domain_utf8_to_ascii(Peer) of
false -> false ->
{error, <<"Cannot decode remote server name">>}; {error, <<"Cannot decode remote server name">>};
AsciiPeer -> AsciiPeer ->
@ -720,7 +720,7 @@ get_cert_domains(Cert) ->
lresource = lresource =
<<"">>} -> <<"">>} ->
case case
idna:domain_utf8_to_ascii(LD) ejabberd_idna:domain_utf8_to_ascii(LD)
of of
false -> false ->
[]; [];

2
src/ejabberd_s2s_out.erl
View File

@ -235,7 +235,7 @@ open_socket(init, StateData) ->
[{StateData#state.myname, StateData#state.server, [{StateData#state.myname, StateData#state.server,
StateData#state.new, StateData#state.verify}]), StateData#state.new, StateData#state.verify}]),
AddrList = case AddrList = case
idna:domain_utf8_to_ascii(StateData#state.server) ejabberd_idna:domain_utf8_to_ascii(StateData#state.server)
of of
false -> []; false -> [];
ASCIIAddr -> get_addr_port(ASCIIAddr) ASCIIAddr -> get_addr_port(ASCIIAddr)