From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 11 Sep 2013 11:47:20 +0000 (+0100)
Subject: Correctly process skipped messages.
X-Git-Tag: 0.6.0~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=150915d96eb1f2e0fb6709276e2209b0b00a5cfe;p=thirdparty%2Frspamd.git

Correctly process skipped messages.
---

diff --git a/src/filter.c b/src/filter.c
index 44fc16a07b..70857ee042 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -262,18 +262,14 @@ process_filters (struct worker_task *task)
 	struct metric                  *metric;
 	gpointer                        item = NULL;
 
-	/* Check skip */
-	if (check_skip (task->cfg->views, task)) {
-		task->is_skipped = TRUE;
-		task->state = WRITE_REPLY;
-		msg_info ("disable check for message id <%s>, view wants spam", task->message_id);
-		return 1;
-	}
 	/* Check want spam setting */
-	if (check_want_spam (task)) {
+	if (check_skip (task->cfg->views, task) || check_want_spam (task)) {
 		task->is_skipped = TRUE;
 		task->state = WRITE_REPLY;
 		msg_info ("disable check for message id <%s>, user wants spam", task->message_id);
+		task->s->wanna_die = TRUE;
+		check_session_pending (task->s);
+
 		return 1;
 	}