message-header-parser: MESSAGE_HEADER_PARSER_FLAG_CLEAN_ONELINE should affect only...

Otherwise it behaves inconsistently between hdr->use_full_value=TRUE/FALSE.

--HG--
branch : HEAD

diff --git a/src/lib-mail/message-header-parser.c b/src/lib-mail/message-header-parser.c
index 7b8de3f2c0cfb00f7f4a4b9f7b7d8ba8ddd34b10..c2cfae704fa1a634f164c456f86476789f79cb9a 100644 (file)
--- a/src/lib-mail/message-header-parser.c
+++ b/src/lib-mail/message-header-parser.c
@@ -355,7 +355,6 @@ int message_parse_header_next(struct message_header_parser_ctx *ctx,
                }
                line->full_value = buffer_get_data(ctx->value_buf,
                                                   &line->full_value_len);
-               line->value = line->full_value + value_pos;
        } else {
                /* we didn't want full_value, and this is a continued line. */
                line->full_value = NULL;

diff --git a/src/lib-mail/message-header-parser.h b/src/lib-mail/message-header-parser.h
index d4919ea83ae263edb5c404c62fd46d1abd13d158..78af2e884ca53cc72f322d4bd27fd5e676307819 100644 (file)
--- a/src/lib-mail/message-header-parser.h
+++ b/src/lib-mail/message-header-parser.h
@@ -12,7 +12,7 @@ enum message_header_parser_flags {
        MESSAGE_HEADER_PARSER_FLAG_SKIP_INITIAL_LWSP    = 0x01,
        /* Don't add CRs to full_value even if input had them */
        MESSAGE_HEADER_PARSER_FLAG_DROP_CR              = 0x02,
-       /* Convert [CR+]LF+LWSP to a space character */
+       /* Convert [CR+]LF+LWSP to a space character in full_value */
        MESSAGE_HEADER_PARSER_FLAG_CLEAN_ONELINE        = 0x04
 };