25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00

Compile some regexps as unicode

This commit is contained in:
Evgeny Khramtsov 2019-07-15 15:26:47 +03:00
parent 2419e00a26
commit a00496a38f
2 changed files with 9 additions and 9 deletions

View File

@ -254,16 +254,16 @@ read_acl(Name, Host) ->
validators() ->
#{ip => econf:list_or_single(econf:ip_mask()),
user => user_validator(econf:user(), econf:domain()),
user_regexp => user_validator(econf:re(), econf:domain()),
user_glob => user_validator(econf:glob(), econf:domain()),
user_regexp => user_validator(econf:re([unicode]), econf:domain()),
user_glob => user_validator(econf:glob([unicode]), econf:domain()),
server => econf:list_or_single(econf:domain()),
server_regexp => econf:list_or_single(econf:re()),
server_glob => econf:list_or_single(econf:glob()),
server_regexp => econf:list_or_single(econf:re([unicode])),
server_glob => econf:list_or_single(econf:glob([unicode])),
resource => econf:list_or_single(econf:resource()),
resource_regexp => econf:list_or_single(econf:re()),
resource_glob => econf:list_or_single(econf:glob()),
node_regexp => node_validator(econf:re(), econf:re()),
node_glob => node_validator(econf:glob(), econf:glob()),
resource_regexp => econf:list_or_single(econf:re([unicode])),
resource_glob => econf:list_or_single(econf:glob([unicode])),
node_regexp => node_validator(econf:re([unicode]), econf:re([unicode])),
node_glob => node_validator(econf:glob([unicode]), econf:glob([unicode])),
shared_group => user_validator(econf:binary(), econf:domain()),
acl => econf:atom()}.

View File

@ -1106,7 +1106,7 @@ mod_opt_type(max_room_id) ->
mod_opt_type(max_rooms_discoitems) ->
econf:non_neg_int();
mod_opt_type(regexp_room_id) ->
econf:re();
econf:re([unicode]);
mod_opt_type(max_room_name) ->
econf:pos_int(infinity);
mod_opt_type(max_user_conferences) ->