From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 27 Nov 2017 20:31:00 +0000 (+0000)
Subject: [Fix] Move composites second pass to the dedicated stage
X-Git-Tag: 1.7.0~398
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fa822ae888ab3ac6e99e458a254ea1083d818a1;p=thirdparty%2Frspamd.git

[Fix] Move composites second pass to the dedicated stage
---

diff --git a/src/libserver/task.c b/src/libserver/task.c
index 7fc6728e83..bf66ec030d 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -784,10 +784,11 @@ rspamd_task_process (struct rspamd_task *task, guint stages)
 			}
 		}
 		break;
-
-	case RSPAMD_TASK_STAGE_IDEMPOTENT:
+	case RSPAMD_TASK_STAGE_COMPOSITES_POST:
 		/* Second run of composites processing before idempotent filters */
 		rspamd_make_composites (task);
+		break;
+	case RSPAMD_TASK_STAGE_IDEMPOTENT:
 		rspamd_symbols_cache_process_symbols (task, task->cfg->cache,
 				RSPAMD_TASK_STAGE_IDEMPOTENT);
 		break;
diff --git a/src/libserver/task.h b/src/libserver/task.h
index 194003e723..8ab9514ce5 100644
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -50,9 +50,10 @@ enum rspamd_task_stage {
 	RSPAMD_TASK_STAGE_LEARN_PRE = (1 << 10),
 	RSPAMD_TASK_STAGE_LEARN = (1 << 11),
 	RSPAMD_TASK_STAGE_LEARN_POST = (1 << 12),
-	RSPAMD_TASK_STAGE_IDEMPOTENT = (1 << 13),
-	RSPAMD_TASK_STAGE_DONE = (1 << 14),
-	RSPAMD_TASK_STAGE_REPLIED = (1 << 15)
+	RSPAMD_TASK_STAGE_COMPOSITES_POST = (1 << 13),
+	RSPAMD_TASK_STAGE_IDEMPOTENT = (1 << 14),
+	RSPAMD_TASK_STAGE_DONE = (1 << 15),
+	RSPAMD_TASK_STAGE_REPLIED = (1 << 16)
 };
 
 #define RSPAMD_TASK_PROCESS_ALL (RSPAMD_TASK_STAGE_CONNECT | \
@@ -68,6 +69,7 @@ enum rspamd_task_stage {
 		RSPAMD_TASK_STAGE_LEARN_PRE | \
 		RSPAMD_TASK_STAGE_LEARN | \
 		RSPAMD_TASK_STAGE_LEARN_POST | \
+		RSPAMD_TASK_STAGE_COMPOSITES_POST | \
 		RSPAMD_TASK_STAGE_IDEMPOTENT | \
 		RSPAMD_TASK_STAGE_DONE)
 #define RSPAMD_TASK_PROCESS_LEARN (RSPAMD_TASK_STAGE_CONNECT | \