From 7c2b83ac6ea0e962e4da1887792f61ea9e17514b Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 1 Dec 2017 07:43:58 +0000 Subject: [PATCH] [Fix] Fix composites processing --- src/libserver/composites.c | 4 ++-- src/libserver/symbols_cache.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libserver/composites.c b/src/libserver/composites.c index 3f74683ed..25ee46811 100644 --- a/src/libserver/composites.c +++ b/src/libserver/composites.c @@ -285,7 +285,7 @@ composites_foreach_callback (gpointer key, gpointer value, void *data) { struct composites_data *cd = data; struct rspamd_composite *comp = value; - gint rc; + gdouble rc; cd->composite = comp; @@ -311,7 +311,7 @@ composites_foreach_callback (gpointer key, gpointer value, void *data) setbit (cd->checked, comp->id * 2); /* Result bit */ - if (rc) { + if (rc != 0) { setbit (cd->checked, comp->id * 2 + 1); rspamd_task_insert_result_single (cd->task, key, 1.0, NULL); } diff --git a/src/libserver/symbols_cache.c b/src/libserver/symbols_cache.c index 719f8aabd..5307c44b6 100644 --- a/src/libserver/symbols_cache.c +++ b/src/libserver/symbols_cache.c @@ -1609,6 +1609,7 @@ rspamd_symbols_cache_process_symbols (struct rspamd_task * task, RSPAMD_CACHE_PASS_POSTFILTERS) { checkpoint->pass = RSPAMD_CACHE_PASS_POSTFILTERS; } + if (stage == RSPAMD_TASK_STAGE_IDEMPOTENT && checkpoint->pass < RSPAMD_CACHE_PASS_IDEMPOTENT) { checkpoint->pass = RSPAMD_CACHE_PASS_IDEMPOTENT; -- 2.39.5