diff options
| -rw-r--r-- | conf/lua/regexp/headers.lua | 2 | ||||
| -rw-r--r-- | src/classifiers/winnow.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/lua/regexp/headers.lua b/conf/lua/regexp/headers.lua index b775f72a9..07f9a785c 100644 --- a/conf/lua/regexp/headers.lua +++ b/conf/lua/regexp/headers.lua @@ -33,7 +33,7 @@ reconf['R_BAD_CTE_7BIT'] = string.format('(%s) & (%s) & (%s)', r_ctype_text, r_c reconf['MISSING_TO']= '!header_exists(To)'; -- Detects undisclosed recipients -local undisc_rcpt = 'To=/^<?undisclosed-recipient/Hi' +local undisc_rcpt = 'To=/^<?undisclosed[- ]recipient/Hi' reconf['R_UNDISC_RCPT'] = string.format('(%s) | (%s)', reconf['MISSING_TO'], undisc_rcpt) -- Detects missing Message-Id diff --git a/src/classifiers/winnow.c b/src/classifiers/winnow.c index f1551fb6e..a5e7b3cf8 100644 --- a/src/classifiers/winnow.c +++ b/src/classifiers/winnow.c @@ -138,8 +138,6 @@ winnow_classify (struct classifier_ctx *ctx, statfile_pool_t * pool, GTree * inp g_assert (ctx != NULL); data.pool = pool; - data.sum = 0; - data.count = 0; data.now = time (NULL); data.ctx = ctx; @@ -167,6 +165,8 @@ winnow_classify (struct classifier_ctx *ctx, statfile_pool_t * pool, GTree * inp } while (cur) { st = cur->data; + data.sum = 0; + data.count = 0; if ((data.file = statfile_pool_is_open (pool, st->path)) == NULL) { if ((data.file = statfile_pool_open (pool, st->path, st->size, FALSE)) == NULL) { msg_warn ("cannot open %s, skip it", st->path); |