Compile some regexps as unicode

diff --git a/src/acl.erl b/src/acl.erl
index 73dd5000a28707cf97936662dccf52d697d87c9b..054fad3655b7563f3ecc1261ccafd93f16389cda 100644 (file)
--- a/src/acl.erl
+++ b/src/acl.erl
@@ -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()}.
 

diff --git a/src/mod_muc.erl b/src/mod_muc.erl
index edefda53308f2e6ead8eabc99ebfbbaa02cd03ef..7915b283ff8e8c18fbfd3c30b7d12d65db24e3dc 100644 (file)
--- a/src/mod_muc.erl
+++ b/src/mod_muc.erl
@@ -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) ->