dovecot-2.2: fts: Fixed fts_enforced=yes when it has to wait for...
dovecot at dovecot.org
dovecot at dovecot.org
Fri May 22 02:43:55 UTC 2015
details: http://hg.dovecot.org/dovecot-2.2/rev/8906101589f9
changeset: 18737:8906101589f9
user: Timo Sirainen <tss at iki.fi>
date: Thu May 21 22:41:43 2015 -0400
description:
fts: Fixed fts_enforced=yes when it has to wait for indexing to finish
diffstat:
src/plugins/fts/fts-storage.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diffs (25 lines):
diff -r b29b48376fb4 -r 8906101589f9 src/plugins/fts/fts-storage.c
--- a/src/plugins/fts/fts-storage.c Thu May 21 22:20:10 2015 -0400
+++ b/src/plugins/fts/fts-storage.c Thu May 21 22:41:43 2015 -0400
@@ -280,11 +280,7 @@
struct fts_mailbox *fbox = FTS_CONTEXT(ctx->transaction->box);
struct fts_search_context *fctx = FTS_CONTEXT(ctx);
- if (fctx == NULL) {
- /* no fts */
- } else if (!fctx->fts_lookup_success && fctx->enforced) {
- return FALSE;
- } else if (fctx->indexer_ctx != NULL) {
+ if (fctx != NULL && fctx->indexer_ctx != NULL) {
/* this command is still building the indexes */
if (!fts_mailbox_build_continue(ctx)) {
*tryagain_r = TRUE;
@@ -295,6 +291,8 @@
return FALSE;
}
}
+ if (fctx != NULL && !fctx->fts_lookup_success && fctx->enforced)
+ return FALSE;
return fbox->module_ctx.super.
search_next_nonblock(ctx, mail_r, tryagain_r);
More information about the dovecot-cvs
mailing list