Add some more SA and perl compat for regexps.

diff --git a/src/libutil/regexp.c b/src/libutil/regexp.c
index a83660e8e3fdb777a31b91cb71e25c7268f954bc..61ddc908a2a575a1538841131c5299af5eb905a1 100644 (file)
--- a/src/libutil/regexp.c
+++ b/src/libutil/regexp.c
@@ -135,6 +135,12 @@ rspamd_regexp_new (const gchar *pattern, const gchar *flags,
                else if (*start == 'm') {
                        start ++;
                        sep = *start;
+
+                       /* Paired braces */
+                       if (sep == '{') {
+                               sep = '}';
+                       }
+
                        rspamd_flags |= RSPAMD_REGEXP_FLAG_FULL_MATCH;
                }
                if (sep == '\0' || g_ascii_isalnum (sep)) {

diff --git a/test/lua/unit/regxep.lua b/test/lua/unit/regxep.lua
index e33d20d4337f5467f0f30ec40ef595c79c5f58a6..04db54aa9b269bd89a85f2ae777aa062957c0273 100644 (file)
--- a/test/lua/unit/regxep.lua
+++ b/test/lua/unit/regxep.lua
@@ -13,6 +13,7 @@ context("Regexp unit tests", function()
       {'/^test$/m', '123test', false},
       {'m,test,', 'test', true},
       {'m,test,', 'test123', false},
+      {'m{https?://[^/?\\s]+?:\\d+(?<!:80)(?<!:443)(?<!:8080)(?:/|\\s|$)}', '', false},
       {'/test/i', 'TeSt123', true},
       {'/тест/i', 'ТесТ', true},
       -- Raw regexp