From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 6 Dec 2015 18:33:42 +0000 (+0000)
Subject: Fix replacements in spamassassin plugin
X-Git-Tag: 1.1.0~399
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9347accacebdcb3015999cc9e04664e54c6535bb;p=rspamd.git

Fix replacements in spamassassin plugin
---

diff --git a/src/plugins/lua/spamassassin.lua b/src/plugins/lua/spamassassin.lua
index ea7b28ffe..24ec601dc 100644
--- a/src/plugins/lua/spamassassin.lua
+++ b/src/plugins/lua/spamassassin.lua
@@ -881,14 +881,17 @@ _.each(function(r)
   if rule['re_expr'] and rule['re'] then
     local res,nexpr = apply_replacements(rule['re_expr'])
     if res then
-      local nre = rspamd_regexp.create_cached(nexpr)
+      local nre = rspamd_regexp.create(nexpr)
       if not nre then
         rspamd_logger.errx(rspamd_config, 'cannot apply replacement for rule %1', r)
         rule['re'] = nil
       else
         rspamd_logger.debugx(rspamd_config, 'replace %1 -> %2', r, nexpr)
+        rspamd_config:replace_regexp({
+          old_re = rule['re'],
+          new_re = nre
+        })
         rule['re'] = nre
-        -- XXX: add removal from the cache logic
         rule['re_expr'] = nexpr
         nre:set_limit(match_limit)
       end