dovecot: Include CRLFs in searched text between headers.
dovecot at dovecot.org
dovecot at dovecot.org
Tue Oct 23 16:49:40 EEST 2007
details: http://hg.dovecot.org/dovecot/rev/59f5c5cbf7b7
changeset: 6607:59f5c5cbf7b7
user: Timo Sirainen <tss at iki.fi>
date: Tue Oct 23 16:49:37 2007 +0300
description:
Include CRLFs in searched text between headers.
diffstat:
1 file changed, 5 insertions(+), 1 deletion(-)
src/lib-mail/message-search.c | 6 +++++-
diffs (21 lines):
diff -r 1fc0aae1c159 -r 59f5c5cbf7b7 src/lib-mail/message-search.c
--- a/src/lib-mail/message-search.c Tue Oct 23 16:44:18 2007 +0300
+++ b/src/lib-mail/message-search.c Tue Oct 23 16:49:37 2007 +0300
@@ -106,12 +106,16 @@ static bool search_header(struct message
static bool search_header(struct message_search_context *ctx,
const struct message_header_line *hdr)
{
+ static const unsigned char crlf[2] = { '\r', '\n' };
+
return str_find_more(ctx->str_find_ctx,
(const unsigned char *)hdr->name, hdr->name_len) ||
str_find_more(ctx->str_find_ctx,
hdr->middle, hdr->middle_len) ||
str_find_more(ctx->str_find_ctx, hdr->full_value,
- hdr->full_value_len);
+ hdr->full_value_len) ||
+ (!hdr->no_newline &&
+ str_find_more(ctx->str_find_ctx, crlf, 2));
}
int message_search_more(struct message_search_context *ctx,
More information about the dovecot-cvs
mailing list