summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2016-02-16 18:24:18 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2016-02-16 18:24:18 +0000
commitda30951c96e75560da9d1457c1cc023655bc3e42 (patch)
tree2886c76832b4f7d5f56a28b60d67efb031899779
parente4d146bfc88fdeed63034f7cc85f2602b25163fb (diff)
downloadrspamd-da30951c96e75560da9d1457c1cc023655bc3e42.tar.gz
rspamd-da30951c96e75560da9d1457c1cc023655bc3e42.zip
Unbreak fuzzy_check plugin
Issue: #527 Reported by: @moisseev
-rw-r--r--src/fuzzy_storage.c3
-rw-r--r--src/plugins/fuzzy_check.c5
2 files changed, 2 insertions, 6 deletions
diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c
index 86153f01c..e4ce81d42 100644
--- a/src/fuzzy_storage.c
+++ b/src/fuzzy_storage.c
@@ -444,12 +444,12 @@ rspamd_fuzzy_process_command (struct fuzzy_session *session)
}
}
+ result.flag = cmd->flag;
if (cmd->cmd == FUZZY_CHECK) {
result = rspamd_fuzzy_backend_check (session->ctx->backend, cmd,
session->ctx->expire);
}
else {
- result.flag = cmd->flag;
if (rspamd_fuzzy_check_client (session)) {
if (session->worker->index == 0 || session->ctx->peer_fd == -1) {
@@ -487,7 +487,6 @@ rspamd_fuzzy_process_command (struct fuzzy_session *session)
reply:
result.tag = cmd->tag;
- result.flag = cmd->flag;
memcpy (&session->reply.rep, &result, sizeof (result));
rspamd_fuzzy_update_stats (session->ctx,
diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index d51a1637a..e62990574 100644
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -2045,12 +2045,9 @@ fuzzy_process_handler (struct rspamd_http_connection_entry *conn_ent,
saved, err);
}
- if (res > 0) {
+ if (res) {
processed = TRUE;
}
- else if (res == -1) {
- break;
- }
cur = g_list_next (cur);
}